diff --git a/CMakeLists.txt b/CMakeLists.txt index e5cbe6daaa..b34ac84a92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -892,42 +892,18 @@ set(PIPELINE_DEST_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CX_CONFIG_DIR}/pipeli set(PIPELINE_EXAMPLES_DEST_DIR "${PIPELINE_DEST_DIR}/Examples") if(SIMPLNX_DOWNLOAD_TEST_FILES AND TARGET SimplnxCore AND TARGET ITKImageProcessing AND TARGET OrientationAnalysis) - add_custom_target(Copy_PorosityAnalysis_Pipelines ALL - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${simplnx_SOURCE_DIR}/pipelines/PorosityAnalysis.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/Examples/PorosityAnalysis.d3dpipeline" - COMMENT "Copying Example Pipelines into Binary Directory" - COMMAND_EXPAND_LISTS - VERBATIM - ) - set_target_properties(Copy_PorosityAnalysis_Pipelines PROPERTIES FOLDER ZZ_COPY_FILES) - add_custom_target(Copy_CAxis_Pipelines ALL - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${simplnx_SOURCE_DIR}/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline" "${PIPELINE_EXAMPLES_DEST_DIR}/Examples/Combo-EBSD-osc_r0c0.d3dpipeline" - COMMENT "Copying Example Pipelines into Binary Directory" - COMMAND_EXPAND_LISTS - VERBATIM +set(PREBUILT_PIPELINE_NAMES ) - set_target_properties(Copy_CAxis_Pipelines PROPERTIES FOLDER ZZ_COPY_FILES) - # Install the pipeline files install(FILES - "${simplnx_SOURCE_DIR}/pipelines/PorosityAnalysis.d3dpipeline" - "${simplnx_SOURCE_DIR}/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline" + ${PREBUILT_PIPELINE_NAMES} DESTINATION "pipelines/Examples" COMPONENT Applications ) - download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_caxis_data.tar.gz SHA512 6c3eefac62aecf3344de735c0df932dd9a2623653f39174ec72402c54e8911402ad9903ae2122bc23ff2dba8c94973b2882715908e1913973dff604b614a5293) - add_custom_target(Copy_CAxis_Data ALL - COMMAND ${CMAKE_COMMAND} -E tar xzf "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data.tar.gz" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data/Combo-EBSD-120130.osc_r0c0.ang" "${DATA_DEST_DIR}/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang" - COMMAND ${CMAKE_COMMAND} -E rm -rf "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data" - WORKING_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles" - COMMENT "[DATA EXTRACT/COPY] 6_6_caxis_data into Binary Directory" - DEPENDS Fetch_Remote_Data_Files # Make sure all remote files are downloaded before trying this - COMMAND_EXPAND_LISTS - VERBATIM - ) - set_target_properties(Copy_CAxis_Data PROPERTIES FOLDER ZZ_COPY_FILES) + create_pipeline_tests(PLUGIN_NAME OrientationAnalysis PIPELINE_LIST ${PREBUILT_PIPELINE_NAMES}) + endif() if(SIMPLNX_ENABLE_INSTALL) diff --git a/docs/Porting_Filters.md b/docs/Porting_Filters.md index 7cea28bb65..73dd6c8abe 100644 --- a/docs/Porting_Filters.md +++ b/docs/Porting_Filters.md @@ -243,15 +243,15 @@ Use proper grouping in the parameters to help the User Interface. There are potentially 3 sections of parameters: ```cpp - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); ``` ```cpp - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); ``` ```cpp - params.insertSeparator(Parameters::Separator{"Created Output Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Output Data Objects"}); ``` these should be used as needed by the filter. diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index b97ad0997f..511250c063 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", "output_image_geometry_path": "ImageDataContainer", - "image_transform_choice": 0, + "image_transform_index": 0, "input_file_list_object": { "end_index": 174, "file_extension": ".tif", @@ -119,7 +119,7 @@ "component_count": 1, "data_format": "", "initialization_value_str": "1", - "numeric_type": 4, + "numeric_type_index": 4, "output_array_path": "ImageDataContainer/Cell Data/Phases", "tuple_dimensions": [ [ diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline index bfec997e20..8ef93cfd7a 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", "output_image_geometry_path": "ImageDataContainer", - "image_transform_choice": 0, + "image_transform_index": 0, "input_file_list_object": { "end_index": 174, "file_extension": ".tif", diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline similarity index 69% rename from pipelines/PorosityAnalysis.d3dpipeline rename to src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline index 7aa9cd88b6..8fa24125ee 100644 --- a/pipelines/PorosityAnalysis.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(04) Porosity Analysis.d3dpipeline @@ -1,14 +1,18 @@ { "isDisabled": false, - "name": "(02) Image Segmentation.d3dpipeline", - "pinnedParams": [], + "name": "(04) Porosity Analysis", "pipeline": [ { "args": { "cell_attribute_matrix_name": "Optical Data", + "color_weights": [ + 0.21250000596046448, + 0.715399980545044, + 0.07209999859333038 + ], + "convert_to_gray_scale": false, "image_data_array_name": "ImageData", - "output_image_geometry_path": "RoboMet.3D Image Stack", - "image_transform_choice": 0, + "image_transform_index": 0, "input_file_list_object": { "end_index": 174, "file_extension": ".tif", @@ -25,15 +29,16 @@ 0.0, 0.0 ], + "output_image_geometry_path": "RoboMet.3D Image Stack", "spacing": [ 1.0, 1.0, 1.0 ] }, - "comments": "This example pipeline shows how to read in a 3D stack of images, segment them and perform some basic size statistics on the segmented features. Since this data set is from an image there is no phase data which is created in a filter and phase data is also generated during the pipeline. Note the technique for accomplishing this as it is handy to do for other pipelines.", + "comments": "", "filter": { - "name": "simplnx::ITKImportImageStack", + "name": "nx::core::ITKImportImageStackFilter", "uuid": "dcf980b7-ecca-46d1-af31-ac65f6e3b6bb" }, "isDisabled": false @@ -55,11 +60,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 @@ -68,9 +78,9 @@ "args": { "active_array_name": "Active", "cell_feature_group_name": "Pore Data", - "feature_ids_path": "FeatureIds", - "input_image_geometry_path": "RoboMet.3D Image Stack", + "feature_ids_name": "FeatureIds", "input_array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", + "input_image_geometry_path": "RoboMet.3D Image Stack", "mask_path": "RoboMet.3D Image Stack/Optical Data/Mask", "randomize_features": true, "scalar_tolerance": 0, @@ -78,7 +88,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ScalarSegmentFeaturesFilter", + "name": "nx::core::ScalarSegmentFeaturesFilter", "uuid": "e067cd97-9bbf-4c92-89a6-3cb4fdb76c93" }, "isDisabled": false @@ -95,7 +105,7 @@ }, "comments": "", "filter": { - "name": "simplnx::CalculateFeatureSizesFilter", + "name": "nx::core::CalculateFeatureSizesFilter", "uuid": "c666ee17-ca58-4969-80d0-819986c72485" }, "isDisabled": false @@ -104,23 +114,25 @@ "args": { "created_array_suffix": "", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "selected_feature_array_paths": ["RoboMet.3D Image Stack/Pore Data/EquivalentDiameters"] + "selected_feature_array_paths": [ + "RoboMet.3D Image Stack/Pore 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, "data_format": "", "initialization_value_str": "1", - "numeric_type": 4, + "numeric_type_index": 4, "output_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", + "set_tuple_dimensions": false, "tuple_dimensions": [ [ 0.0 @@ -129,7 +141,7 @@ }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -137,6 +149,7 @@ { "args": { "conditional_array_path": "RoboMet.3D Image Stack/Optical Data/Mask", + "invert_mask": false, "remove_value": "0", "replace_value": "2", "selected_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", @@ -144,7 +157,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", + "name": "nx::core::ConditionalSetValueFilter", "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" }, "isDisabled": false @@ -158,7 +171,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindFeaturePhasesFilter", + "name": "nx::core::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -172,71 +185,48 @@ }, "comments": "", "filter": { - "name": "simplnx::FindFeatureCentroidsFilter", + "name": "nx::core::FindFeatureCentroidsFilter", "uuid": "c6875ac7-8bdd-4f69-b6ce-82ac09bd3421" }, "isDisabled": false }, { "args": { - "cell_ensemble_attribute_matrix_name": "RoboMet.3D Image Stack/EnsembleAttributeMatrix", - "crystal_structures_array_name": "CrystalStructures", - "ensemble": [ - [ - "Cubic-High m-3m", - "Matrix", - "Matrix" - ], + "data_object_path": "RoboMet.3D Image Stack/Ensemble Data", + "tuple_dimensions": [ [ - "Cubic-High m-3m", - "Precipitate", - "Pores" + 3.0 ] - ], - "phase_names_array_name": "PhaseNames", - "phase_types_array_name": "PhaseTypes" - }, - "comments": "We only need the phase names array for this ensemble data so we will be immediately deleting the crystal structures and phase types arrays after this filter.", - "filter": { - "name": "simplnx::CreateEnsembleInfoFilter", - "uuid": "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d" - }, - "isDisabled": false - }, - { - "args": { - "removed_data_path": [ - "RoboMet.3D Image Stack/EnsembleAttributeMatrix/CrystalStructures", - "RoboMet.3D Image Stack/EnsembleAttributeMatrix/PhaseTypes" ] }, "comments": "", "filter": { - "name": "simplnx::DeleteDataFilter", - "uuid": "bf286740-e987-49fe-a7c8-6e566e3a0606" + "name": "nx::core::CreateAttributeMatrixFilter", + "uuid": "a6a28355-ee69-4874-bcac-76ed427423ed" }, "isDisabled": false }, { "args": { "biased_features_array_path": "", - "cell_ensemble_attribute_matrix_name": "RoboMet.3D Image Stack/EnsembleAttributeMatrix", + "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", "number_of_bins": 10, "phase_number": 2, "rdf_array_name": "RDF", "remove_biased_features": false, + "seed_array_name": "FindFeatureClustering SeedValue", "seed_value": 5489, - "input_image_geometry_path": "RoboMet.3D Image Stack", "set_random_seed": false }, "comments": "", "filter": { - "name": "simplnx::FindFeatureClusteringFilter", + "name": "nx::core::FindFeatureClusteringFilter", "uuid": "d6e01678-3a03-433f-89ad-4e9adf1f9a45" }, "isDisabled": false @@ -248,11 +238,11 @@ }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp index 0e8e5f1ee6..ff528791da 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAbsImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKAbsImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp index 49ad0c43c9..a81760222c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAcosImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKAcosImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp index 26d4c2ab1f..5bc3c33b25 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAdaptiveHistogramEqualizationImageFilter.cpp @@ -81,7 +81,7 @@ std::vector ITKAdaptiveHistogramEqualizationImageFilter::defaultTag Parameters ITKAdaptiveHistogramEqualizationImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Radius_Key, "Radius", "Radius Dimensions XYZ", std::vector(3, 5), std::vector{"X", "Y", "Z"})); params.insert(std::make_unique( @@ -90,14 +90,14 @@ Parameters ITKAdaptiveHistogramEqualizationImageFilter::parameters() const k_Beta_Key, "Beta", "Set/Get the value of beta. If beta = 1 (and alpha = 1), then the output image matches the input image. As beta approaches 0, the filter behaves as an unsharp mask. Default is 0.3.", 0.3f)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp index 3905da327f..7e13ba984c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKApproximateSignedDistanceMapImageFilter.cpp @@ -71,17 +71,17 @@ std::vector ITKApproximateSignedDistanceMapImageFilter::defaultTags Parameters ITKApproximateSignedDistanceMapImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_InsideValue_Key, "InsideValue", "Set/Get intensity value representing the interior of objects in the mask.", 1u)); - params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Set/Get intensity value representing non-objects in the mask.", 0u)); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_InsideValue_Key, "Inside Value", "Set/Get intensity value representing the interior of objects in the mask.", 1u)); + params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "Set/Get intensity value representing non-objects in the mask.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp index e1e8129565..ab5aa82b38 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAsinImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKAsinImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp index 36c7c26249..5f2f62a094 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKAtanImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKAtanImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp index 43aa791153..1fec45e534 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryContourImageFilter.cpp @@ -74,22 +74,22 @@ std::vector ITKBinaryContourImageFilter::defaultTags() const Parameters ITKBinaryContourImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); - params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); + params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp index c6d1363445..0f13375e69 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryDilateImageFilter.cpp @@ -80,23 +80,23 @@ std::vector ITKBinaryDilateImageFilter::defaultTags() const Parameters ITKBinaryDilateImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); - params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); + params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp index 85c110f4c1..1652713220 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryErodeImageFilter.cpp @@ -80,23 +80,23 @@ std::vector ITKBinaryErodeImageFilter::defaultTags() const Parameters ITKBinaryErodeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); - params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the background value used to mark the pixels not on the border of the objects.", 0.0)); + params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set/Get the foreground value used to identify the objects in the input and output images.", 1.0)); params.insert(std::make_unique(k_BoundaryToForeground_Key, "BoundaryToForeground", "Mark the boundary between foreground and background.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp index 5262cd2b18..59a5b3a28e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalClosingImageFilter.cpp @@ -78,23 +78,23 @@ std::vector ITKBinaryMorphologicalClosingImageFilter::defaultTags() Parameters ITKBinaryMorphologicalClosingImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); params.insert( - std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of InputPixelType.", 1.0)); - params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); + std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of InputPixelType.", 1.0)); + params.insert(std::make_unique(k_SafeBorder_Key, "Safe Border", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp index dcea6101ae..4df5f548b8 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryMorphologicalOpeningImageFilter.cpp @@ -77,22 +77,22 @@ std::vector ITKBinaryMorphologicalOpeningImageFilter::defaultTags() Parameters ITKBinaryMorphologicalOpeningImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the value in eroded part of the image. Defaults to zero", 0.0)); - params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the value in eroded part of the image. Defaults to zero", 0.0)); + params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp index 7cc6e3aace..5f274e2c1f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryOpeningByReconstructionImageFilter.cpp @@ -80,26 +80,26 @@ std::vector ITKBinaryOpeningByReconstructionImageFilter::defaultTag Parameters ITKBinaryOpeningByReconstructionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_ForegroundValue_Key, "ForegroundValue", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the value in eroded part of the image. Defaults to zero", 0.0)); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType.", 1.0)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the value in eroded part of the image. Defaults to zero", 0.0)); + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp index 7e2c2a08ad..e5f5cfcdb4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryProjectionImageFilter.cpp @@ -73,24 +73,24 @@ std::vector ITKBinaryProjectionImageFilter::defaultTags() const Parameters ITKBinaryProjectionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ProjectionDimension_Key, "Projection Dimension", "The dimension index to project. 0=Slowest moving dimension.", 0u)); params.insert(std::make_unique( - k_ForegroundValue_Key, "ForegroundValue", + k_ForegroundValue_Key, "Foreground Value", "Set the value in the image to consider as 'foreground'. Defaults to maximum value of PixelType. Subclasses may alias this to DilateValue or ErodeValue.", 1.0)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the value used as 'background'. Any pixel value which is not DilateValue is considered background. BackgroundValue is used for defining " "boundary conditions. Defaults to NumericTraits::NonpositiveMin() .", 0.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp index 8db50f0385..fd350cbb57 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThinningImageFilter.cpp @@ -66,14 +66,14 @@ Parameters ITKBinaryThinningImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp index 2b82980fc9..794ead0ea3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBinaryThresholdImageFilter.cpp @@ -77,23 +77,23 @@ std::vector ITKBinaryThresholdImageFilter::defaultTags() const Parameters ITKBinaryThresholdImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_LowerThreshold_Key, "LowerThreshold", "The lower threshold that a pixel value could be and still be considered 'Inside Value'", 0.0)); - params.insert(std::make_unique(k_UpperThreshold_Key, "UpperThreshold", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_LowerThreshold_Key, "Lower Threshold", "The lower threshold that a pixel value could be and still be considered 'Inside Value'", 0.0)); + params.insert(std::make_unique(k_UpperThreshold_Key, "Upper Threshold", "Set the thresholds. The default lower threshold is NumericTraits::NonpositiveMin() . The default upper threshold is " "NumericTraits::max . An exception is thrown if the lower threshold is greater than the upper threshold.", 255.0)); - params.insert(std::make_unique(k_InsideValue_Key, "InsideValue", "Set the 'inside' pixel value. The default value NumericTraits::max()", 1u)); - params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); + params.insert(std::make_unique(k_InsideValue_Key, "Inside Value", "Set the 'inside' pixel value. The default value NumericTraits::max()", 1u)); + params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp index 66fa0acb2b..62a8e9bb81 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBlackTopHatImageFilter.cpp @@ -75,21 +75,21 @@ std::vector ITKBlackTopHatImageFilter::defaultTags() const Parameters ITKBlackTopHatImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); + params.insert(std::make_unique(k_SafeBorder_Key, "Safe Border", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp index 04f2b4661d..afe32c5e0d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKBoundedReciprocalImageFIlter.cpp @@ -67,13 +67,13 @@ Parameters ITKBoundedReciprocalImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp index ca11adb675..b5920941f5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKClosingByReconstructionImageFilter.cpp @@ -77,12 +77,12 @@ std::vector ITKClosingByReconstructionImageFilter::defaultTags() co Parameters ITKClosingByReconstructionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); @@ -90,14 +90,14 @@ Parameters ITKClosingByReconstructionImageFilter::parameters() const k_PreserveIntensities_Key, "PreserveIntensities", "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp index 5df906244f..987301d759 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKConnectedComponentImageFilter.cpp @@ -69,19 +69,19 @@ std::vector ITKConnectedComponentImageFilter::defaultTags() const Parameters ITKConnectedComponentImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp index 3d2b462de1..8fad7aa3bc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCosImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKCosImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp index 22f0f87269..35536f80c5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureAnisotropicDiffusionImageFilter.cpp @@ -73,7 +73,7 @@ std::vector ITKCurvatureAnisotropicDiffusionImageFilter::defaultTag Parameters ITKCurvatureAnisotropicDiffusionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_TimeStep_Key, "Time Step", "The time step to be used for each iteration.", 0.0625)); params.insert(std::make_unique(k_ConductanceParameter_Key, "Conductance Parameter", "The conductance parameter controls the sensitivity of the conductance term in the basic anisotropic diffusion equation", 3.0)); @@ -81,13 +81,13 @@ Parameters ITKCurvatureAnisotropicDiffusionImageFilter::parameters() const params.insert(std::make_unique(k_NumberOfIterations_Key, "Number Of Iterations", "Specifies the number of iterations (time-step updates) that the solver will perform to produce a solution image", 5u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetFloatingScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp index a3b3ab0ba4..df94ce4c16 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKCurvatureFlowImageFilter.cpp @@ -71,17 +71,17 @@ std::vector ITKCurvatureFlowImageFilter::defaultTags() const Parameters ITKCurvatureFlowImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_TimeStep_Key, "Time Step", "The timestep between iteration updates", 0.05)); params.insert(std::make_unique(k_NumberOfIterations_Key, "Number Of Iterations", "The number of update iterations ", 5u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp index a1cbeed624..ac3dd4cb6c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDanielssonDistanceMapImageFilter.cpp @@ -73,7 +73,7 @@ std::vector ITKDanielssonDistanceMapImageFilter::defaultTags() cons Parameters ITKDanielssonDistanceMapImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert( std::make_unique(k_InputIsBinary_Key, "Input Is Binary", "Set/Get if the input is binary. If this variable is set, each nonzero pixel in the input image will be given a unique numeric code to be used by the Voronoi " @@ -82,13 +82,13 @@ Parameters ITKDanielssonDistanceMapImageFilter::parameters() const params.insert(std::make_unique(k_SquaredDistance_Key, "Squared Distance", "Set/Get if the distance should be squared.", false)); params.insert(std::make_unique(k_UseImageSpacing_Key, "Use Image Spacing", "Set/Get if image spacing should be used in computing distances.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp index 67af8ee401..275672772f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDilateObjectMorphologyImageFilter.cpp @@ -75,21 +75,21 @@ std::vector ITKDilateObjectMorphologyImageFilter::defaultTags() con Parameters ITKDilateObjectMorphologyImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_ObjectValue_Key, "ObjectValue", "The pixel value of the 'Object' to be dilated", 1)); + params.insert(std::make_unique(k_ObjectValue_Key, "Object Value", "The pixel value of the 'Object' to be dilated", 1)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp index 243ab3c2c1..4d8ce7a345 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDiscreteGaussianImageFilter.cpp @@ -79,7 +79,7 @@ std::vector ITKDiscreteGaussianImageFilter::defaultTags() const Parameters ITKDiscreteGaussianImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( k_Variance_Key, "Variance", "The variance for the discrete Gaussian kernel. Sets the variance independently for each dimension, but see also SetVariance(const double v) . The default is 0.0 in each dimension. If " @@ -94,19 +94,19 @@ Parameters ITKDiscreteGaussianImageFilter::parameters() const std::vector(3, 0.01), std::vector{"X", "Y", "Z"})); params.insert( - std::make_unique(k_UseImageSpacing_Key, "UseImageSpacing", + std::make_unique(k_UseImageSpacing_Key, "Use Image Spacing", "Set/Get whether or not the filter will use the spacing of the input image in its calculations. Use On to take the image spacing information into account and to " "specify the Gaussian variance in real world units; use Off to ignore the image spacing and to specify the Gaussian variance in voxel units. Default is On.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp index 84eb9cf209..cf1071931c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKDoubleThresholdImageFilter.cpp @@ -82,7 +82,7 @@ std::vector ITKDoubleThresholdImageFilter::defaultTags() const Parameters ITKDoubleThresholdImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Threshold1_Key, "Threshold1", "Set the thresholds. Four thresholds should be specified. The two lower thresholds default to NumericTraits::NonpositiveMin() . The " "two upper thresholds default NumericTraits::max . Threshold1 <= Threshold2 <= Threshold3 <= Threshold4.", @@ -99,20 +99,20 @@ Parameters ITKDoubleThresholdImageFilter::parameters() const "Set the thresholds. Four thresholds should be specified. The two lower thresholds default to NumericTraits::NonpositiveMin() . The " "two upper thresholds default NumericTraits::max . Threshold1 <= Threshold2 <= Threshold3 <= Threshold4.", 255.0)); - params.insert(std::make_unique(k_InsideValue_Key, "InsideValue", "Set the 'inside' pixel value. The default value NumericTraits::max()", 1u)); - params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); + params.insert(std::make_unique(k_InsideValue_Key, "Inside Value", "Set the 'inside' pixel value. The default value NumericTraits::max()", 1u)); + params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0u)); params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp index df4393dcfc..37216806d5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKErodeObjectMorphologyImageFilter.cpp @@ -77,22 +77,22 @@ std::vector ITKErodeObjectMorphologyImageFilter::defaultTags() cons Parameters ITKErodeObjectMorphologyImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_ObjectValue_Key, "ObjectValue", "The pixel value of the 'Object' to be dilated", 1)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the value to be assigned to eroded pixels", 0)); + params.insert(std::make_unique(k_ObjectValue_Key, "Object Value", "The pixel value of the 'Object' to be dilated", 1)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the value to be assigned to eroded pixels", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp index 204503da4b..45c5bf26e5 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKExpImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp index 34c6d828c0..3a5763b65d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKExpNegativeImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKExpNegativeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp index a47af3ac56..c983c69b98 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientAnisotropicDiffusionImageFilter.cpp @@ -75,7 +75,7 @@ std::vector ITKGradientAnisotropicDiffusionImageFilter::defaultTags Parameters ITKGradientAnisotropicDiffusionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_TimeStep_Key, "Time Step", "The time step to be used for each iteration.", 0.125)); params.insert(std::make_unique(k_ConductanceParameter_Key, "Conductance Parameter", "The conductance parameter controls the sensitivity of the conductance term in the basic anisotropic diffusion equation", 3.0)); @@ -83,13 +83,13 @@ Parameters ITKGradientAnisotropicDiffusionImageFilter::parameters() const params.insert(std::make_unique(k_NumberOfIterations_Key, "Number Of Iterations", "Specifies the number of iterations (time-step updates) that the solver will perform to produce a solution image", 5u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetFloatingScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp index 9f27805264..0e28a722fe 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeImageFilter.cpp @@ -71,20 +71,20 @@ std::vector ITKGradientMagnitudeImageFilter::defaultTags() const Parameters ITKGradientMagnitudeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_UseImageSpacing_Key, "UseImageSpacing", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_UseImageSpacing_Key, "Use Image Spacing", "Set/Get whether or not the filter will use the spacing of the input image in the computation of the derivatives. Use On to compute the gradient in " "physical space; use Off to ignore image spacing and to compute the gradient in isotropic voxel space. Default is On.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp index defab2cde6..2002a6ca19 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGradientMagnitudeRecursiveGaussianImageFilter.cpp @@ -72,18 +72,18 @@ Parameters ITKGradientMagnitudeRecursiveGaussianImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Sigma_Key, "Sigma", "Set/Get Sigma value. Sigma is measured in the units of image spacing.", 1.0)); params.insert(std::make_unique(k_NormalizeAcrossScale_Key, "Normalize Across Scale", "Set/Get the normalization factor that will be used for the Gaussian. RecursiveGaussianImageFilter::SetNormalizeAcrossScale", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp index 9b343b18fc..6133df8cd4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleDilateImageFilter.cpp @@ -72,20 +72,20 @@ std::vector ITKGrayscaleDilateImageFilter::defaultTags() const Parameters ITKGrayscaleDilateImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp index 7f4a7f0383..24be45224b 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleErodeImageFilter.cpp @@ -72,20 +72,20 @@ std::vector ITKGrayscaleErodeImageFilter::defaultTags() const Parameters ITKGrayscaleErodeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp index 1b54fb33fb..1dfc540966 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleFillholeImageFilter.cpp @@ -69,20 +69,20 @@ std::vector ITKGrayscaleFillholeImageFilter::defaultTags() const Parameters ITKGrayscaleFillholeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp index aa95a6c7d4..a1f7c59293 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleGrindPeakImageFilter.cpp @@ -69,20 +69,20 @@ std::vector ITKGrayscaleGrindPeakImageFilter::defaultTags() const Parameters ITKGrayscaleGrindPeakImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp index c3b088cc6e..ee82d4aa07 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalClosingImageFilter.cpp @@ -75,21 +75,21 @@ std::vector ITKGrayscaleMorphologicalClosingImageFilter::defaultTag Parameters ITKGrayscaleMorphologicalClosingImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); + params.insert(std::make_unique(k_SafeBorder_Key, "Safe Border", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp index 1048851b5d..28251a8a27 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKGrayscaleMorphologicalOpeningImageFilter.cpp @@ -75,21 +75,21 @@ std::vector ITKGrayscaleMorphologicalOpeningImageFilter::defaultTag Parameters ITKGrayscaleMorphologicalOpeningImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); + params.insert(std::make_unique(k_SafeBorder_Key, "Safe Border", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp index 4596e234d4..9e7049d94e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHConvexImageFilter.cpp @@ -72,24 +72,24 @@ std::vector ITKHConvexImageFilter::defaultTags() const Parameters ITKHConvexImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Height_Key, "Height", "Set/Get the height that a local maximum must be above the local background (local contrast) in order to survive the processing. Local maxima below " "this value are replaced with an estimate of the local background.", 2.0)); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp index f91bb3a313..f7be5b5aff 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMaximaImageFilter.cpp @@ -69,20 +69,20 @@ std::vector ITKHMaximaImageFilter::defaultTags() const Parameters ITKHMaximaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Height_Key, "Height", "Set/Get the height that a local maximum must be above the local background (local contrast) in order to survive the processing. Local maxima below " "this value are replaced with an estimate of the local background.", 2.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp index c0cd18d9df..a73c17147e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKHMinimaImageFilter.cpp @@ -72,24 +72,24 @@ std::vector ITKHMinimaImageFilter::defaultTags() const Parameters ITKHMinimaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Height_Key, "Height", "Set/Get the height that a local maximum must be above the local background (local contrast) in order to survive the processing. Local maxima below " "this value are replaced with an estimate of the local background.", 2.0)); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp index fefcdbaf3d..85e07e5c82 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp @@ -58,7 +58,7 @@ Parameters ITKImageReaderFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_LengthUnit_Key, "Length Unit", "The length unit that will be set into the created image geometry", to_underlying(IGeometry::LengthUnit::Micrometer), IGeometry::GetAllLengthUnitStrings())); @@ -66,7 +66,7 @@ Parameters ITKImageReaderFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_ChangeOrigin_Key, "Set Origin", "Specifies if the origin should be changed", false)); params.insert( std::make_unique(k_CenterOrigin_Key, "Put Input Origin at the Center of Geometry", "Specifies if the origin should be aligned with the corner (false) or center (true)", false)); - params.insert(std::make_unique(k_Origin_Key, "Origin (Physical Units)", "Specifies the new origin values in physical units.", std::vector{0.0, 0.0, 0.0}, + params.insert(std::make_unique(k_Origin_Key, "Origin (Physical Units)", "Specifies the new origin values in physical units.", std::vector{0.0, 0.0, 0.0}, std::vector{"X", "Y", "Z"})); params.insertLinkableParameter(std::make_unique(k_ChangeSpacing_Key, "Set Spacing", "Specifies if the spacing should be changed", false)); @@ -81,7 +81,7 @@ Parameters ITKImageReaderFilter::parameters() const FileSystemPathParameter::ExtensionsType{{".png"}, {".tiff"}, {".tif"}, {".bmp"}, {".jpeg"}, {".jpg"}, {".nrrd"}, {".mha"}}, FileSystemPathParameter::PathType::InputFile, false)); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"ImageDataContainer"}))); params.insert(std::make_unique(k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName)); params.insert(std::make_unique(k_ImageDataArrayPath_Key, "Created Cell Data", diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp index 5d5fb46683..0f5049ab43 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriterFilter.cpp @@ -292,13 +292,13 @@ Parameters ITKImageWriterFilter::parameters() const Parameters params; using ExtensionListType = std::unordered_set; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Plane_Key, "Plane", "Selection for plane normal for writing the images (XY, XZ, or YZ)", 0, ChoicesParameter::Choices{"XY", "XZ", "YZ"})); params.insert( std::make_unique(k_FileName_Key, "Output File", "Path to the output file to write.", fs::path(), ExtensionListType{}, FileSystemPathParameter::PathType::OutputFile)); params.insert(std::make_unique(k_IndexOffset_Key, "Index Offset", "This is the starting index when writing mulitple images", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ImageArrayPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp index 8c95f28950..09c3967cc6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp @@ -73,7 +73,7 @@ Parameters ITKImportFijiMontageFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Fiji Configuration File", "This is the configuration file in the same directory as all of the identified geometries", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); params.insert(std::make_unique(k_LengthUnit_Key, "Length Unit", "The length unit that will be set into the created image geometry", @@ -86,7 +86,7 @@ Parameters ITKImportFijiMontageFilter::parameters() const std::vector(3))); params.insertLinkableParameter(std::make_unique(k_ParentDataGroup_Key, "Parent Imported Images Under a DataGroup", "Create a new DataGroup to hold the imported images", true)); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_DataGroupName_Key, "Name of Created DataGroup", "Name of the overarching parent DataGroup", "Zen DataGroup")); params.insert(std::make_unique(k_DataContainerPath_Key, "Image Geometry Prefix", "A prefix that can be used for each Image Geometry", "Mosaic-")); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix Name", "The name of the Cell Attribute Matrix", "Tile Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp index aedbf1bf80..1cd50c5677 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp @@ -305,7 +305,7 @@ std::vector ITKImportImageStackFilter::defaultTags() const Parameters ITKImportImageStackFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the 3D volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"X", "y", "Z"})); params.insert(std::make_unique(k_Spacing_Key, "Spacing", "The spacing of the 3D volume", std::vector{1.0F, 1.0F, 1.0F}, std::vector{"X", "y", "Z"})); params.insertLinkableParameter(std::make_unique(k_ImageTransformChoice_Key, "Optional Slice Operations", @@ -315,11 +315,11 @@ Parameters ITKImportImageStackFilter::parameters() const params.insert(std::make_unique(k_ColorWeights_Key, "Color Weighting", "RGB weights for the grayscale conversion using the luminosity algorithm.", std::vector{0.2125f, 0.7154f, 0.0721f}, std::vector({"Red", "Green", "Blue"}))); - params.insertSeparator(Parameters::Separator{"File List"}); + params.insertSeparator(Parameters::Separator{"Input File List"}); params.insert( std::make_unique(k_InputFileListInfo_Key, "Input File List", "The list of 2D image files to be read in to a 3D volume", GeneratedFileListParameter::ValueType{})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Data"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"ImageDataContainer"}))); params.insert(std::make_unique(k_CellDataName_Key, "Cell Data Name", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName)); params.insert(std::make_unique(k_ImageDataArrayPath_Key, "Created Image Data", "The path to the created image data array", "ImageData")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp index 2fd4a32721..0b4ae82ed6 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIntensityWindowingImageFilter.cpp @@ -75,20 +75,20 @@ std::vector ITKIntensityWindowingImageFilter::defaultTags() const Parameters ITKIntensityWindowingImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_WindowMinimum_Key, "WindowMinimum", "Set/Get the values of the maximum and minimum intensities of the input intensity window.", 0.0)); - params.insert(std::make_unique(k_WindowMaximum_Key, "WindowMaximum", "Set/Get the values of the maximum and minimum intensities of the input intensity window.", 255.0)); - params.insert(std::make_unique(k_OutputMinimum_Key, "OutputMinimum", "Set/Get the values of the maximum and minimum intensities of the output image.", 0.0)); - params.insert(std::make_unique(k_OutputMaximum_Key, "OutputMaximum", "Set/Get the values of the maximum and minimum intensities of the output image.", 255.0)); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_WindowMinimum_Key, "Window Minimum", "Set/Get the values of the maximum and minimum intensities of the input intensity window.", 0.0)); + params.insert(std::make_unique(k_WindowMaximum_Key, "Window Maximum", "Set/Get the values of the maximum and minimum intensities of the input intensity window.", 255.0)); + params.insert(std::make_unique(k_OutputMinimum_Key, "Output Minimum", "Set/Get the values of the maximum and minimum intensities of the output image.", 0.0)); + params.insert(std::make_unique(k_OutputMaximum_Key, "Output Maximum", "Set/Get the values of the maximum and minimum intensities of the output image.", 255.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp index bab2627774..057b470546 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKInvertIntensityImageFilter.cpp @@ -70,17 +70,17 @@ std::vector ITKInvertIntensityImageFilter::defaultTags() const Parameters ITKInvertIntensityImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Maximum_Key, "Maximum", "Set/Get the maximum intensity value for the inversion.", 255)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp index 4efa11b3b0..f97be5323f 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKIsoContourDistanceImageFilter.cpp @@ -71,17 +71,17 @@ std::vector ITKIsoContourDistanceImageFilter::defaultTags() const Parameters ITKIsoContourDistanceImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_LevelSetValue_Key, "Level Set Value", "Set/Get the value of the level set to be located. The default value is 0.", 0.0)); params.insert(std::make_unique(k_FarValue_Key, "Far Value", "Set/Get the value of the level set to be located. The default value is 0.", 10)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp index c402d23cfb..55746ece82 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLabelContourImageFilter.cpp @@ -72,22 +72,22 @@ std::vector ITKLabelContourImageFilter::defaultTags() const Parameters ITKLabelContourImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "\note For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the background value used to identify the objects and mark the pixels not on the border of the objects.", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp index c72b75f11d..80ee0dd448 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLaplacianRecursiveGaussianImageFilter.cpp @@ -72,18 +72,18 @@ std::vector ITKLaplacianRecursiveGaussianImageFilter::defaultTags() Parameters ITKLaplacianRecursiveGaussianImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Sigma_Key, "Sigma", "Set/Get Sigma value. Sigma is measured in the units of image spacing.", 1.0)); params.insert(std::make_unique(k_NormalizeAcrossScale_Key, "Normalize Across Scale", "Define which normalization factor will be used for the Gaussian. See RecursiveGaussianImageFilter::SetNormalizeAcrossScale", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp index 7c32b48e5f..5f5032d784 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLog10ImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKLog10ImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp index ff124c0d1a..a7752981ce 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKLogImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKLogImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp index bd7fceca63..1c38c4c874 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMaskImageFilter.cpp @@ -144,19 +144,19 @@ Parameters ITKMaskImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "Method to explicitly set the outside value of the mask.", 0)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert( - std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, nx::core::GetAllDataTypes())); + std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_MaskImageDataPath_Key, "MaskImage", "The path to the image data to be used as the mask (should be the same size as the input image)", DataPath{}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp index b647bd6217..cf711ae2e4 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMeanProjectionImageFilter.cpp @@ -70,16 +70,16 @@ std::vector ITKMeanProjectionImageFilter::defaultTags() const Parameters ITKMeanProjectionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ProjectionDimension_Key, "Projection Dimension", "The dimension index to project. 0=Slowest moving dimension.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp index 303ce3e606..46c0163613 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMedianImageFilter.cpp @@ -77,17 +77,17 @@ std::vector ITKMedianImageFilter::defaultTags() const Parameters ITKMedianImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Radius_Key, "Radius", "Radius Dimensions XYZ", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp index 620b286df7..d4b4d774d9 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp @@ -266,7 +266,7 @@ Parameters ITKMhaFileReaderFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(ITKImageReaderFilter::k_FileName_Key, "Input MHA File", "The input .mha file that will be read.", fs::path(""), FileSystemPathParameter::ExtensionsType{{".mha"}}, FileSystemPathParameter::PathType::InputFile, false)); @@ -275,7 +275,7 @@ Parameters ITKMhaFileReaderFilter::parameters() const params.insert(std::make_unique(k_InterpolationTypeKey, "Interpolation Type", "The type of interpolation algorithm that is used. 0=NearestNeighbor, 1=Linear", k_NearestNeighborInterpolationIdx, k_InterpolationChoices)); - params.insertSeparator(Parameters::Separator{"Transformation Matrix Options"}); + params.insertSeparator(Parameters::Separator{"Optional Transformation Matrix Parameters"}); params.insert(std::make_unique(k_TransposeTransformMatrix, "Transpose Stored Transformation Matrix", "When true, the transformation matrix found in the image's header metadata will be transposed before use.", false)); params.insertLinkableParameter( @@ -284,12 +284,13 @@ Parameters ITKMhaFileReaderFilter::parameters() const params.insert(std::make_unique(k_TransformationMatrixDataArrayPathKey, "Transformation Matrix", "The path to the transformation matrix data array", DataPath({"ImageDataContainer", "TransformationMatrix"}))); - params.insertSeparator(Parameters::Separator{"Created Image Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Image Data Objects"}); params.insert(std::make_unique(ITKImageReaderFilter::k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"ImageDataContainer"}))); - + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert( std::make_unique(ITKImageReaderFilter::k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName)); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(ITKImageReaderFilter::k_ImageDataArrayPath_Key, "Created Cell Data", "The name of the created image data array. Will be stored in the created Cell Attribute Matrix", "ImageData")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp index f68c113a6b..af6eb5162d 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMinMaxCurvatureFlowImageFilter.cpp @@ -73,19 +73,19 @@ std::vector ITKMinMaxCurvatureFlowImageFilter::defaultTags() const Parameters ITKMinMaxCurvatureFlowImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_TimeStep_Key, "Time Step", "The time step to be used for each iteration.", 0.05)); params.insert(std::make_unique(k_NumberOfIterations_Key, "Number Of Iterations", "Specifies the number of iterations (time-step updates) that the solver will perform to produce a solution image", 5u)); params.insert(std::make_unique(k_StencilRadius_Key, "Stencil Radius", "Set/Get the stencil radius.", 2)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetFloatingScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp index 5d2edc202f..0efd2b7fcc 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalGradientImageFilter.cpp @@ -72,20 +72,20 @@ std::vector ITKMorphologicalGradientImageFilter::defaultTags() cons Parameters ITKMorphologicalGradientImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp index 8a90d2bf9b..039da520c1 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedFromMarkersImageFilter.cpp @@ -69,7 +69,7 @@ std::vector ITKMorphologicalWatershedFromMarkersImageFilter::defaul Parameters ITKMorphologicalWatershedFromMarkersImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( k_MarkWatershedLine_Key, "Mark Watershed Line", "Set/Get whether the watershed pixel must be marked or not. Default is true. Set it to false do not only avoid writing watershed pixels, it also decrease algorithm complexity.", true)); @@ -78,13 +78,13 @@ Parameters ITKMorphologicalWatershedFromMarkersImageFilter::parameters() const "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp index 53dc8a96cf..10962aed98 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMorphologicalWatershedImageFilter.cpp @@ -76,24 +76,24 @@ std::vector ITKMorphologicalWatershedImageFilter::defaultTags() con Parameters ITKMorphologicalWatershedImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Level_Key, "Level", "Set the 'level' variable to the filter", 0.0)); params.insert(std::make_unique( k_MarkWatershedLine_Key, "MarkWatershedLine", "Set/Get whether the watershed pixel must be marked or not. Default is true. Set it to false do not only avoid writing watershed pixels, it also decrease algorithm complexity.", true)); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp index 1f1947b1eb..a7dde418e7 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeImageFilter.cpp @@ -69,14 +69,14 @@ Parameters ITKNormalizeImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp index e29978b3e3..84a383130c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNormalizeToConstantImageFilter.cpp @@ -70,16 +70,16 @@ std::vector ITKNormalizeToConstantImageFilter::defaultTags() const Parameters ITKNormalizeToConstantImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Constant_Key, "Constant", "Set/get the normalization constant.", 1.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp index 4753bedd15..53643f6af0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKNotImageFilter.cpp @@ -66,14 +66,14 @@ Parameters ITKNotImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp index 60e456441a..0fa4f5e071 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOpeningByReconstructionImageFilter.cpp @@ -77,12 +77,12 @@ std::vector ITKOpeningByReconstructionImageFilter::defaultTags() co Parameters ITKOpeningByReconstructionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_FullyConnected_Key, "FullyConnected", + params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected", "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); @@ -90,14 +90,14 @@ Parameters ITKOpeningByReconstructionImageFilter::parameters() const k_PreserveIntensities_Key, "PreserveIntensities", "Set/Get whether the original intensities of the image retained for those pixels unaffected by the opening by reconstruction. If Off, the output pixel contrast will be reduced.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp index b95ba415ae..5e0d15dca0 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKOtsuMultipleThresholdsImageFilter.cpp @@ -80,22 +80,22 @@ std::vector ITKOtsuMultipleThresholdsImageFilter::defaultTags() con Parameters ITKOtsuMultipleThresholdsImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_NumberOfThresholds_Key, "NumberOfThresholds", "Set/Get the number of thresholds. Default is 1.", 1u)); - params.insert(std::make_unique(k_LabelOffset_Key, "LabelOffset", "Set/Get the offset which labels have to start from. Default is 0.", 0u)); - params.insert(std::make_unique(k_NumberOfHistogramBins_Key, "NumberOfHistogramBins", "Set/Get the number of histogram bins. Default is 128.", 128u)); - params.insert(std::make_unique(k_ValleyEmphasis_Key, "ValleyEmphasis", "Set/Get the use of valley emphasis. Default is false.", false)); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_NumberOfThresholds_Key, "Number Of Thresholds", "Set/Get the number of thresholds. Default is 1.", 1u)); + params.insert(std::make_unique(k_LabelOffset_Key, "Label Offset", "Set/Get the offset which labels have to start from. Default is 0.", 0u)); + params.insert(std::make_unique(k_NumberOfHistogramBins_Key, "Number Of Histogram Bins", "Set/Get the number of histogram bins. Default is 128.", 128u)); + params.insert(std::make_unique(k_ValleyEmphasis_Key, "Valley Emphasis", "Set/Get the use of valley emphasis. Default is false.", false)); params.insert( std::make_unique(k_ReturnBinMidpoint_Key, "ReturnBinMidpoint", "Should the threshold value be mid-point of the bin or the maximum? Default is to return bin maximum.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp index b646b8d745..6d3c3a5a34 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMaximaImageFilter.cpp @@ -76,7 +76,7 @@ std::vector ITKRegionalMaximaImageFilter::defaultTags() const Parameters ITKRegionalMaximaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the value used as 'background' in the output image. Defaults to NumericTraits::NonpositiveMin() .", 0.0)); params.insert( @@ -87,13 +87,13 @@ Parameters ITKRegionalMaximaImageFilter::parameters() const false)); params.insert(std::make_unique(k_FlatIsMaxima_Key, "Flat Is Maxima", "Set/Get whether a flat image must be considered as a maxima or not. Defaults to true.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp index ec98245fa0..0e7ffc920e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRegionalMinimaImageFilter.cpp @@ -76,7 +76,7 @@ std::vector ITKRegionalMinimaImageFilter::defaultTags() const Parameters ITKRegionalMinimaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the value used as 'background' in the output image. Defaults to NumericTraits::NonpositiveMin() .", 0.0)); params.insert( @@ -85,15 +85,15 @@ Parameters ITKRegionalMinimaImageFilter::parameters() const "Set/Get whether the connected components are defined strictly by face connectivity or by face+edge+vertex connectivity. Default is FullyConnectedOff. " "For objects that are 1 pixel wide, use FullyConnectedOn.", false)); - params.insert(std::make_unique(k_FlatIsMinima_Key, "FlatIsMinima", "Set/Get whether a flat image must be considered as a minima or not. Defaults to true.", true)); + params.insert(std::make_unique(k_FlatIsMinima_Key, "Flat Is Minima", "Set/Get whether a flat image must be considered as a minima or not. Defaults to true.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp index 6dbbe6d9f5..c426c241b2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRelabelComponentImageFilter.cpp @@ -72,22 +72,22 @@ std::vector ITKRelabelComponentImageFilter::defaultTags() const Parameters ITKRelabelComponentImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( - k_MinimumObjectSize_Key, "MinimumObjectSize", + k_MinimumObjectSize_Key, "Minimum Object Size", "Set the minimum size in pixels for an object. All objects smaller than this size will be discarded and will not appear in the output label map. NumberOfObjects will count only the objects " "whose pixel counts are greater than or equal to the minimum size. Call GetOriginalNumberOfObjects to find out how many objects were present in the original label map.", 0u)); params.insert(std::make_unique(k_SortByObjectSize_Key, "SortByObjectSize", "Controls whether the object labels are sorted by size. If false, initial order of labels is kept.", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp index 59c33646f7..215f52c71a 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKRescaleIntensityImageFilter.cpp @@ -72,18 +72,18 @@ std::vector ITKRescaleIntensityImageFilter::defaultTags() const Parameters ITKRescaleIntensityImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputMinimum_Key, "Output Minimum", "The minimum output value that is used.", 0)); params.insert(std::make_unique(k_OutputMaximum_Key, "Output Maximum", "The maximum output value that is used.", 255)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp index bdcf6e566f..ae61c3d288 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSigmoidImageFilter.cpp @@ -75,20 +75,20 @@ std::vector ITKSigmoidImageFilter::defaultTags() const Parameters ITKSigmoidImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Alpha_Key, "Alpha", "The Alpha value from the Sigmoid equation. ", 1)); params.insert(std::make_unique(k_Beta_Key, "Beta", "The Beta value from teh sigmoid equation", 0)); params.insert(std::make_unique(k_OutputMaximum_Key, "Output Maximum", "The maximum output value", 255)); params.insert(std::make_unique(k_OutputMinimum_Key, "Output Minimum", "The minimum output value", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp index 89d16f29c3..022a44f935 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedDanielssonDistanceMapImageFilter.cpp @@ -73,19 +73,19 @@ std::vector ITKSignedDanielssonDistanceMapImageFilter::defaultTags( Parameters ITKSignedDanielssonDistanceMapImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InsideIsPositive_Key, "Inside Is Positive", "Set if the inside represents positive values in the signed distance map. By convention ON pixels are treated as inside pixels.", false)); params.insert(std::make_unique(k_SquaredDistance_Key, "Squared Distance", "Set if the distance should be squared.", false)); params.insert(std::make_unique(k_UseImageSpacing_Key, "Use Image Spacing", "Set if image spacing should be used in computing distances.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp index d7d329f80c..2ea5fbe071 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSignedMaurerDistanceMapImageFilter.cpp @@ -78,21 +78,21 @@ std::vector ITKSignedMaurerDistanceMapImageFilter::defaultTags() co Parameters ITKSignedMaurerDistanceMapImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_InsideIsPositive_Key, "InsideIsPositive", + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_InsideIsPositive_Key, "Inside Is Positive", "Set if the inside represents positive values in the signed distance map. By convention ON pixels are treated as inside pixels.", false)); params.insert(std::make_unique(k_SquaredDistance_Key, "SquaredDistance", "Set if the distance should be squared.", true)); - params.insert(std::make_unique(k_UseImageSpacing_Key, "UseImageSpacing", "Set if image spacing should be used in computing distances.", false)); - params.insert(std::make_unique(k_BackgroundValue_Key, "BackgroundValue", "Set the background value which defines the object. Usually this value is = 0.", 0.0)); + params.insert(std::make_unique(k_UseImageSpacing_Key, "Use Image Spacing", "Set if image spacing should be used in computing distances.", false)); + params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set the background value which defines the object. Usually this value is = 0.", 0.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetIntegerScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp index b6bfef7640..acab0af470 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSinImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKSinImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp index 0670d7ce2a..821ca52d6c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSmoothingRecursiveGaussianImageFilter.cpp @@ -78,17 +78,17 @@ std::vector ITKSmoothingRecursiveGaussianImageFilter::defaultTags() Parameters ITKSmoothingRecursiveGaussianImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( k_NormalizeAcrossScale_Key, "Normalize Across Scale", "Set/Get the flag for normalizing the Gaussian over scale-space. This method does not effect the output of this filter. \see RecursiveGaussianImageFilter::SetNormalizeAcrossScale", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{})); + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp index f0c2aa2341..f3fbf5b2ec 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSqrtImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKSqrtImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp index 3978de287d..30f3107a02 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSquareImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKSquareImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp index 4dd3ead205..4f3de195f3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKStandardDeviationProjectionImageFilter.cpp @@ -69,16 +69,16 @@ std::vector ITKStandardDeviationProjectionImageFilter::defaultTags( Parameters ITKStandardDeviationProjectionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ProjectionDimension_Key, "Projection Dimension", "The dimension index to project. 0=Slowest moving dimension.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp index 1436845d72..b502a7fa71 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKSumProjectionImageFilter.cpp @@ -70,16 +70,16 @@ std::vector ITKSumProjectionImageFilter::defaultTags() const Parameters ITKSumProjectionImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ProjectionDimension_Key, "Projection Dimension", "The dimension index to project. 0=Slowest moving dimension.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp index f5804abbf2..7a4374d7b3 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKTanImageFilter.cpp @@ -67,14 +67,14 @@ Parameters ITKTanImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp index 9b7d2aee8d..bfa2abf867 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdImageFilter.cpp @@ -73,20 +73,20 @@ std::vector ITKThresholdImageFilter::defaultTags() const Parameters ITKThresholdImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Lower_Key, "Lower", "Set/Get methods to set the lower threshold.", 0.0)); params.insert(std::make_unique(k_Upper_Key, "Upper", "Set/Get methods to set the upper threshold.", 1.0)); - params.insert(std::make_unique(k_OutsideValue_Key, "OutsideValue", + params.insert(std::make_unique(k_OutsideValue_Key, "Outside Value", "The pixel type must support comparison operators. Set the 'outside' pixel value. The default value NumericTraits::ZeroValue() .", 0.0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp index b02ccfc9c7..5456157d0c 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKThresholdMaximumConnectedComponentsImageFilter.cpp @@ -75,9 +75,9 @@ std::vector ITKThresholdMaximumConnectedComponentsImageFilter::defa Parameters ITKThresholdMaximumConnectedComponentsImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( - k_MinimumObjectSizeInPixels_Key, "MinimumObjectSizeInPixels", + k_MinimumObjectSizeInPixels_Key, "Minimum Object Size In Pixels", "The pixel type must support comparison operators. Set the minimum pixel area used to count objects on the image. Thus, only objects that have a pixel area greater than the minimum pixel area " "will be counted as an object in the optimization portion of this filter. Essentially, it eliminates noise from being counted as an object. The default value is zero.", 0u)); @@ -100,13 +100,13 @@ Parameters ITKThresholdMaximumConnectedComponentsImageFilter::parameters() const "value is the minimum pixel type intensity. Upper threshold boundary is the maximum pixel type intensity.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp index f3f7830b4a..971ae37dab 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMaximaImageFilter.cpp @@ -69,19 +69,19 @@ std::vector ITKValuedRegionalMaximaImageFilter::defaultTags() const Parameters ITKValuedRegionalMaximaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected Components", "Whether the connected components are defined strictly by face connectivity (False) or by face+edge+vertex connectivity (True). Default is False" "For objects that are 1 pixel wide, use True.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp index 5c91eb9131..805ace09c2 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKValuedRegionalMinimaImageFilter.cpp @@ -69,19 +69,19 @@ std::vector ITKValuedRegionalMinimaImageFilter::defaultTags() const Parameters ITKValuedRegionalMinimaImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FullyConnected_Key, "Fully Connected Components", "Whether the connected components are defined strictly by face connectivity (False) or by face+edge+vertex connectivity (True). Default is False" "For objects that are 1 pixel wide, use True.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp index eef4cb4e8a..b5f0d23e09 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKWhiteTopHatImageFilter.cpp @@ -75,21 +75,21 @@ std::vector ITKWhiteTopHatImageFilter::defaultTags() const Parameters ITKWhiteTopHatImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique>(k_KernelRadius_Key, "KernelRadius", "The radius of the kernel structuring element.", std::vector(3, 1), + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique>(k_KernelRadius_Key, "Kernel Radius", "The radius of the kernel structuring element.", std::vector(3, 1), std::vector{"X", "Y", "Z"})); - params.insert(std::make_unique(k_KernelType_Key, "KernelType", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), + params.insert(std::make_unique(k_KernelType_Key, "Kernel Type", "Set the kernel or structuring element used for the morphology.", static_cast(itk::simple::sitkBall), ChoicesParameter::Choices{"Annulus", "Ball", "Box", "Cross"})); - params.insert(std::make_unique(k_SafeBorder_Key, "SafeBorder", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); + params.insert(std::make_unique(k_SafeBorder_Key, "Safe Border", "A safe border is added to input image to avoid borders effects and remove it once the closing is done", true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp index 0282d06efb..72ce82fcca 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKZeroCrossingImageFilter.cpp @@ -71,17 +71,17 @@ std::vector ITKZeroCrossingImageFilter::defaultTags() const Parameters ITKZeroCrossingImageFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ForegroundValue_Key, "Foreground Value", "Set/Get the label value for zero-crossing pixels.", 1u)); params.insert(std::make_unique(k_BackgroundValue_Key, "Background Value", "Set/Get the label value for non-zero-crossing pixels.", 0u)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, nx::core::ITK::GetSignedScalarPixelAllowedTypes())); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_OutputImageArrayName_Key, "Output Image Data Array", "The result of the processing will be stored in this Data Array.", "Output Image Data")); diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp index 3c4e709ec1..38a3bdf6bd 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters_Private/ImportVectorImageStack.cpp @@ -52,7 +52,7 @@ Parameters ImportVectorImageStack::parameters() const params.insert(std::make_unique(k_Spacing_Key, "Spacing", "", std::vector(3), std::vector(3))); params.insert(std::make_unique(k_ConvertToGrayscale_Key, "Convert Color To Grayscale", "", false)); params.insert(std::make_unique(k_DataContainerName_Key, "Data Container Name", "", DataPath{})); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix Name", "", DataPath{})); params.insert(std::make_unique(k_VectorDataArrayName_Key, "Vector Data Array Name", "", DataPath{})); diff --git a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt index 07e9933883..89af617cb7 100644 --- a/src/Plugins/ITKImageProcessing/test/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/test/CMakeLists.txt @@ -112,6 +112,7 @@ set(PREBUILT_PIPELINE_NAMES # Example or other test pipelines "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/(02) Image Segmentation.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/(03) Porosity Mesh Export.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/(04) Porosity Analysis.d3dpipeline" ) # ----------------------------------------------------------------------------- diff --git a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in index d29ae9920c..e6d1746224 100644 --- a/src/Plugins/ITKImageProcessing/tools/filter.cpp.in +++ b/src/Plugins/ITKImageProcessing/tools/filter.cpp.in @@ -54,12 +54,12 @@ Parameters ${FILTER_NAME}Filter::parameters() const { Parameters params; ${PARAMETER_DEFS} - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_InputImageGeomPath_Key, "Image Geometry", "Select the Image Geometry Group from the DataStructure.", DataPath({"Image Geometry"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Image Data Array", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); + params.insert(std::make_unique(k_InputImageDataPath_Key, "Input Cell Data", "The image data that will be processed by this filter.", DataPath{}, ${INPUT_ARRAY_TYPES})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Image Array Name", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_OutputImageArrayName_Key, "Output Cell Data", "The result of the processing will be stored in this Data Array inside the same group as the input data.", "Output Image Data")); return params; } diff --git a/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py b/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py index fa6988929e..e57226824e 100644 --- a/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py +++ b/src/Plugins/ITKImageProcessing/tools/itk_filter_generator.py @@ -806,7 +806,7 @@ def write_filter_source(filter_data: FilterData, template: Template, output_dir: parameter_defs = get_parameter_defs(filter_data) if parameter_defs: - parameter_defs.insert(0, ' params.insertSeparator(Parameters::Separator{"Input Parameters"});') + parameter_defs.insert(0, ' params.insertSeparator(Parameters::Separator{"Input Parameter(s)"});') parameter_defs_str = '\n'.join(parameter_defs) if parameter_defs: diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index d23c59ccaf..04db9fa738 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -324,8 +324,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME T12-MAI-2010.tar.gz SHA512 e33f224d19ad774604aa28a3263a00221a3a5909040685a3d14b6cba78e36d174b045223c28b462ab3eaea0fbc1c9f0657b1bd791a947799b9f088b13d777568 - INSTALL - ) + INSTALL) add_custom_target(Copy_${PLUGIN_NAME}_T12-MAI-2010 ALL COMMAND ${CMAKE_COMMAND} -E tar xzf "${DREAM3D_DATA_DIR}/TestFiles/T12-MAI-2010.tar.gz" COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${DREAM3D_DATA_DIR}/TestFiles/T12-MAI-2010" "${DATA_DEST_DIR}/T12-MAI-2010" @@ -341,8 +340,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME Textured_Copper.tar.gz SHA512 cb231a13abbc21fe2046fc0fc7be9753ea51440bce1827bd20ee225499cd38be07d67955ff8c09d15ad91c4c1934e2a0e34406a703e7e49fbe53068b29ef440e - INSTALL - ) + INSTALL) add_custom_target(Copy_${PLUGIN_NAME}_Textured_Copper ALL COMMAND ${CMAKE_COMMAND} -E tar xzf "${DREAM3D_DATA_DIR}/TestFiles/Textured_Copper.tar.gz" COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different "${DREAM3D_DATA_DIR}/TestFiles/Textured_Copper" "${DATA_DEST_DIR}/Textured_Copper" @@ -371,6 +369,26 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES) ) set_target_properties(Copy_${PLUGIN_NAME}_Small_IN100 PROPERTIES FOLDER ZZ_COPY_FILES) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} + ARCHIVE_NAME 6_6_caxis_data.tar.gz + SHA512 6c3eefac62aecf3344de735c0df932dd9a2623653f39174ec72402c54e8911402ad9903ae2122bc23ff2dba8c94973b2882715908e1913973dff604b614a5293 + ) + add_custom_target(Copy_${PLUGIN_NAME}_CAxis_Data ALL + COMMAND ${CMAKE_COMMAND} -E tar xzf "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data.tar.gz" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data/Combo-EBSD-120130.osc_r0c0.ang" "${DATA_DEST_DIR}/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang" + COMMAND ${CMAKE_COMMAND} -E rm -rf "${DREAM3D_DATA_DIR}/TestFiles/6_6_caxis_data" + WORKING_DIRECTORY "${DREAM3D_DATA_DIR}/TestFiles" + COMMENT "Copying ${PLUGIN_NAME}/6_6_caxis_data data into Binary Directory" + DEPENDS Fetch_Remote_Data_Files # Make sure all remote files are downloaded before trying this + COMMAND_EXPAND_LISTS + VERBATIM + ) + install(FILES "${DATA_DEST_DIR}/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang" + DESTINATION Data/${PLUGIN_NAME} + COMPONENT Applications + ) + set_target_properties(Copy_${PLUGIN_NAME}_CAxis_Data PROPERTIES FOLDER ZZ_COPY_FILES) + download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME 6_6_ImportH5Data.tar.gz SHA512 68cf620d28a515d04040d66c4f8fa9d8d46707c65138b366b47f40d1d56a36c40e2e2cd0c9d35168b68c2cb5b2ce95650fa2a0d4e6ffce980d0dd0654908f40d diff --git a/src/Plugins/OrientationAnalysis/docs/CAxisSegmentFeaturesFilter.md b/src/Plugins/OrientationAnalysis/docs/CAxisSegmentFeaturesFilter.md index f49c935c5e..9fc33510dc 100644 --- a/src/Plugins/OrientationAnalysis/docs/CAxisSegmentFeaturesFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/CAxisSegmentFeaturesFilter.md @@ -22,7 +22,7 @@ After all the **Features** have been identified, a **Feature Attribute Matrix** ## Example Pipelines -Combo-EBSD-osc_r0c0 +EBSD_Hexagonal_Data_Analysis ## License & Copyright diff --git a/src/Plugins/OrientationAnalysis/docs/FindAvgCAxesFilter.md b/src/Plugins/OrientationAnalysis/docs/FindAvgCAxesFilter.md index 96b2dc3cb6..b290ce4020 100644 --- a/src/Plugins/OrientationAnalysis/docs/FindAvgCAxesFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/FindAvgCAxesFilter.md @@ -22,7 +22,7 @@ This filter will error out if **ALL** phases are non-hexagonal. Any non-hexagona ## Example Pipelines -Combo-EBSD-osc_r0c0 +EBSD_Hexagonal_Data_Analysis ## License & Copyright diff --git a/src/Plugins/OrientationAnalysis/docs/FindCAxisLocationsFilter.md b/src/Plugins/OrientationAnalysis/docs/FindCAxisLocationsFilter.md index aa9eae902a..38860e4213 100644 --- a/src/Plugins/OrientationAnalysis/docs/FindCAxisLocationsFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/FindCAxisLocationsFilter.md @@ -14,7 +14,7 @@ This **Filter** determines the direction of the C-axis for each **Elemen ## Example Pipelines -Combo-EBSD-osc_r0c0 +EBSD_Hexagonal_Data_Analysis ## License & Copyright diff --git a/src/Plugins/OrientationAnalysis/docs/FindFeatureNeighborCAxisMisalignmentsFilter.md b/src/Plugins/OrientationAnalysis/docs/FindFeatureNeighborCAxisMisalignmentsFilter.md index f7bdcf1e38..3612cfab25 100644 --- a/src/Plugins/OrientationAnalysis/docs/FindFeatureNeighborCAxisMisalignmentsFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/FindFeatureNeighborCAxisMisalignmentsFilter.md @@ -16,7 +16,7 @@ This **Filter** determines, for each **Feature**, the C-axis misalignments with ## Example Pipelines -Combo-EBSD-osc_r0c0 +EBSD_Hexagonal_Data_Analysis ## License & Copyright diff --git a/src/Plugins/OrientationAnalysis/docs/FindFeatureReferenceCAxisMisorientationsFilter.md b/src/Plugins/OrientationAnalysis/docs/FindFeatureReferenceCAxisMisorientationsFilter.md index 9d26f420c9..bbd8dedd5a 100644 --- a/src/Plugins/OrientationAnalysis/docs/FindFeatureReferenceCAxisMisorientationsFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/FindFeatureReferenceCAxisMisorientationsFilter.md @@ -14,7 +14,7 @@ This filter requires at least one Hexagonal crystal structure phase (Hexagonal-L ## Example Pipelines -Combo-EBSD-osc_r0c0 +EBSD_Hexagonal_Data_Analysis ## License & Copyright diff --git a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline index 5450f6e59c..f422fb5f58 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/CI_Histogram.d3dpipeline @@ -62,7 +62,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", @@ -137,13 +137,13 @@ }, { "args": { - "delimiter": 2, + "delimiter_index": 2, "file_extension": ".csv", - "includes": 1, + "header_option_index": 1, "max_val_per_line": 0, "output_dir": "Data/Output/OrientationAnalysis/", "output_path": "Data/Output/OrientationAnalysis/Test/CI_Histogram.csv", - "output_style": 1, + "output_style_index": 1, "input_data_array_paths": [ "DataContainer/Statistics/Confidence Index Histogram" ] diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline index 914d1df917..8e5e88ebab 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline @@ -16,8 +16,8 @@ "start_index": 1 }, "output_file_path": "Data/Output/Reconstruction/Small_IN100.h5ebsd", - "reference_frame": 0, - "stacking_order": 1, + "reference_frame_index": 0, + "stacking_orde_index": 1, "z_spacing": 0.25 }, "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index fb3d4567f8..235de1616c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -750,9 +750,9 @@ "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "g_beuclidean_distances_array_path": "CellData/GBEuclideanDistances", + "gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances", "quats_array_path": "DataContainer/CellData/Quats", - "reference_orientation": 0 + "reference_orientation_index": 0 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline index f0d4a3bcc0..0f11352cd3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline @@ -90,7 +90,7 @@ "remove_original_geometry": true, "renumber_features": true, "input_image_geometry_path": "DataContainer", - "update_origin": true + "use_physical_bounds": false }, "comments": "", "filter": { @@ -101,8 +101,8 @@ }, { "args": { - "data": ["DataContainer/CellEnsembleData"], - "new_parent": "DataContainer" + "source_data_paths": ["DataContainer/CellEnsembleData"], + "destination_parent_path": "DataContainer" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline index 578f47404c..2e9780e01a 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline @@ -97,7 +97,7 @@ }, { "args": { - "chosen_limit_dists": 0, + "chosen_limit_dists_index": 0, "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "dist_output_file": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_1.dat", "err_output_file": "Data/Output/SurfaceMesh/7_0_small_in100_distribution_errors_1.dat", diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline similarity index 83% rename from pipelines/Combo-EBSD-osc_r0c0.d3dpipeline rename to src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline index e586f0278e..759a797fe8 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline @@ -1,24 +1,24 @@ { "isDisabled": false, - "name": "Combo-EBSD-osc_r0c0.d3dpipeline", - "pinnedParams": [], + "name": "EBSD Hexagonal Data Analysis", "pipeline": [ { "args": { "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", - "output_image_geometry_path": "DataContainer", - "input_file": "Data/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang" + "input_file": "Data/OrientationAnalysis/Combo-EBSD-120130.osc_r0c0.ang", + "output_image_geometry_path": "DataContainer" }, "comments": "", "filter": { - "name": "simplnx::ReadAngDataFilter", + "name": "nx::core::ReadAngDataFilter", "uuid": "5b062816-79ac-47ce-93cb-e7966896bcbd" }, "isDisabled": false }, { "args": { + "input_image_geometry_path": "DataContainer", "output_image_geometry_path": "", "remove_original_geometry": true, "rotate_slice_by_slice": false, @@ -54,12 +54,11 @@ 1.0 ] ], - "rotation_representation": 0, - "input_image_geometry_path": "DataContainer" + "rotation_representation_index": 0 }, "comments": "", "filter": { - "name": "simplnx::RotateSampleRefFrameFilter", + "name": "nx::core::RotateSampleRefFrameFilter", "uuid": "d2451dc1-a5a1-4ac2-a64d-7991669dcffc" }, "isDisabled": false @@ -76,7 +75,7 @@ }, "comments": "", "filter": { - "name": "simplnx::RotateEulerRefFrameFilter", + "name": "nx::core::RotateEulerRefFrameFilter", "uuid": "0458edcd-3655-4465-adc8-b036d76138b5" }, "isDisabled": false @@ -98,11 +97,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 @@ -123,7 +127,7 @@ }, "comments": "", "filter": { - "name": "simplnx::GenerateIPFColorsFilter", + "name": "nx::core::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -132,13 +136,13 @@ "args": { "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0.png", "image_array_path": "DataContainer/CellData/IPFColors", - "input_image_geometry_path": "DataContainer", "index_offset": 0, - "plane": 0 + "input_image_geometry_path": "DataContainer", + "plane_index": 0 }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -152,7 +156,7 @@ }, "comments": "", "filter": { - "name": "simplnx::ConvertOrientations", + "name": "nx::core::ConvertOrientationsFilter", "uuid": "501e54e6-a66f-4eeb-ae37-00e649c00d4b" }, "isDisabled": false @@ -164,8 +168,8 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/CellData/Mask", "input_image_geometry_path": "DataContainer", + "mask_array_path": "DataContainer/CellData/Mask", "misorientation_tolerance": 5.0, "quats_array_path": "DataContainer/CellData/Quats", "randomize_feature_ids": true, @@ -173,14 +177,14 @@ }, "comments": "", "filter": { - "name": "simplnx::CAxisSegmentFeaturesFilter", + "name": "nx::core::CAxisSegmentFeaturesFilter", "uuid": "9fe07e17-aef1-4bf1-834c-d3a73dafc27d" }, "isDisabled": false }, { "args": { - "avg_c_axes_array_path": "AvgCAxes", + "avg_c_axes_array_name": "AvgCAxes", "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", @@ -189,7 +193,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindAvgCAxesFilter", + "name": "nx::core::FindAvgCAxesFilter", "uuid": "453cdb58-7bbb-4576-ad5e-f75a1c54d348" }, "isDisabled": false @@ -208,7 +212,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindFeatureReferenceCAxisMisorientationsFilter", + "name": "nx::core::FindFeatureReferenceCAxisMisorientationsFilter", "uuid": "16c487d2-8f99-4fb5-a4df-d3f70a8e6b25" }, "isDisabled": false @@ -222,25 +226,11 @@ }, "comments": "", "filter": { - "name": "simplnx::FindCAxisLocationsFilter", + "name": "nx::core::FindCAxisLocationsFilter", "uuid": "a51c257a-ddc1-499a-9b21-f2d25a19d098" }, "isDisabled": false }, - { - "args": { - "output_rgb_array_name": "Feature Ids (Color)", - "input_data_array_path": "DataContainer/CellData/FeatureIds", - "selected_preset": "hsv", - "use_mask": false - }, - "comments": "", - "filter": { - "name": "simplnx::GenerateColorTableFilter", - "uuid": "d1731177-4d70-41c0-9334-566a0b482796" - }, - "isDisabled": false - }, { "args": { "array_thresholds_object": { @@ -258,28 +248,37 @@ "type": "collection", "union": 0 }, - "output_data_array_name": "Mask Inverse" + "created_mask_type": 10, + "custom_false_value": 0.0, + "custom_true_value": 1.0, + "output_data_array_name": "Mask Inverse", + "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 }, { "args": { - "conditional_array_path": "DataContainer/CellData/Mask Inverse", - "invert_mask": false, - "remove_value": "0", - "replace_value": "0", - "selected_array_path": "DataContainer/CellData/Feature Ids (Color)", - "use_conditional": true + "input_data_array_path": "DataContainer/CellData/FeatureIds", + "invalid_color_value": [ + 0, + 0, + 0 + ], + "mask_array_path": "DataContainer/CellData/Mask Inverse", + "output_rgb_array_name": "Feature Ids (Color)", + "selected_preset": "hsv", + "use_mask": true }, "comments": "", "filter": { - "name": "simplnx::ConditionalSetValueFilter", - "uuid": "bad9b7bd-1dc9-4f21-a889-6520e7a41881" + "name": "nx::core::GenerateColorTableFilter", + "uuid": "d1731177-4d70-41c0-9334-566a0b482796" }, "isDisabled": false }, @@ -287,13 +286,13 @@ "args": { "file_name": "Data/Output/Examples/Combo-EBSD-osc_r0c0._feature_ids.png", "image_array_path": "DataContainer/CellData/Feature Ids (Color)", - "input_image_geometry_path": "DataContainer", "index_offset": 0, - "plane": 0 + "input_image_geometry_path": "DataContainer", + "plane_index": 0 }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false @@ -307,7 +306,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindFeaturePhasesFilter", + "name": "nx::core::FindFeaturePhasesFilter", "uuid": "da5bb20e-4a8e-49d9-9434-fbab7bc434fc" }, "isDisabled": false @@ -324,7 +323,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindAvgOrientationsFilter", + "name": "nx::core::FindAvgOrientationsFilter", "uuid": "086ddb9a-928f-46ab-bad6-b1498270d71e" }, "isDisabled": false @@ -344,7 +343,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindNeighborsFilter", + "name": "nx::core::FindNeighborsFilter", "uuid": "7177e88c-c3ab-4169-abe9-1fdaff20e598" }, "isDisabled": false @@ -361,7 +360,7 @@ }, "comments": "", "filter": { - "name": "simplnx::FindFeatureNeighborCAxisMisalignmentsFilter", + "name": "nx::core::FindFeatureNeighborCAxisMisalignmentsFilter", "uuid": "636ee030-9f07-4f16-a4f3-592eff8ef1ee" }, "isDisabled": false @@ -373,11 +372,11 @@ }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline index fcc997f613..10da408310 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/Edax_IPF_Colors.d3dpipeline @@ -62,7 +62,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", @@ -125,7 +125,7 @@ "image_array_path": "DataContainer/Cell Data/IPFColors", "input_image_geometry_path": "DataContainer", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index feeb75fd79..f198097cdf 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -11,7 +11,7 @@ 100, 2 ], - "geometry_data_path": "[Image Geometry]", + "output_image_geometry_path": "[Image Geometry]", "origin": [ 0.0, 0.0, @@ -71,7 +71,7 @@ "args": { "component_count": 1, "initialization_value_str": "1", - "numeric_type": 4, + "numeric_type_index": 4, "output_array_path": "[Image Geometry]/Cell Data/Phases", "tuple_dimensions": [ [ diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index 8b7ad71056..f5e34c708d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -1006,9 +1006,9 @@ "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", "feature_ids_path": "DataContainer/CellData/FeatureIds", "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "g_beuclidean_distances_array_path": "CellData/GBEuclideanDistances", + "gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances", "quats_array_path": "DataContainer/CellData/Quats", - "reference_orientation": 0 + "reference_orientation_index": 0 }, "comments": "", "filter": { @@ -1078,7 +1078,7 @@ "remove_original_geometry": true, "renumber_features": true, "input_image_geometry_path": "DataContainer", - "update_origin": true + "use_physical_bounds": false }, "comments": "", "filter": { @@ -1292,7 +1292,7 @@ }, { "args": { - "chosen_limit_dists": 2, + "chosen_limit_dists_index": 2, "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "dist_output_file": "Data/Output/Examples/gbcd_distribution.dat", "err_output_file": "Data/Output/Examples/gbcd_distribution_errors.dat", diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline index 1870b9ece3..4dbfc0e1e2 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", "degrees_to_radians": true, - "image_geometry_name": "ImageGeom", + "output_image_geometry_path": "ImageGeom", "origin": [ 0.0, 0.0, diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index 27086657a3..ba54570a98 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -6,7 +6,7 @@ "args": { "cell_attribute_matrix_name": "Cell Data", "cell_ensemble_attribute_matrix_name": "Cell Ensemble Data", - "image_geometry_name": "ImageGeom", + "output_image_geometry_path": "ImageGeom", "origin": [ 0.0, 0.0, @@ -91,7 +91,7 @@ 1.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "ImageGeom" }, "comments": "", diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline index 81719ed549..2a338ab402 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadAng.d3dpipeline @@ -61,7 +61,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", diff --git a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline index 3f616ec8b4..a7cf7204ee 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ReadCTF.d3dpipeline @@ -55,7 +55,7 @@ 1.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline index 5fa7ae8778..c9d8cece34 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Exposed.d3dpipeline @@ -47,7 +47,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" }, "comments": "", @@ -59,9 +59,9 @@ }, { "args": { - "cell_feature_attribute_matrix": "CellFeatureData", + "cell_feature_attribute_matrix_path": "CellFeatureData", "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "feature_ids": "", + "feature_ids_path": "", "max_voxel": [ 460, 399, @@ -75,7 +75,7 @@ "remove_original_geometry": true, "renumber_features": false, "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "update_origin": true + "use_physical_bounds": false }, "comments": "", "filter": { @@ -137,7 +137,7 @@ "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Exposed_001", "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -151,10 +151,10 @@ "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "generation_algorithm": 0, + "generation_algorithm_index": 0, "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", "output_image_geometry_path": "PoleFigure", - "image_layout": 2, + "image_layout_index": 2, "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Exposed_", "image_size": 1024, "lambert_size": 64, diff --git a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline index ac7716f15b..6594db2ea1 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/TxCopper_Unexposed.d3dpipeline @@ -47,7 +47,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2" }, "comments": "", @@ -59,9 +59,9 @@ }, { "args": { - "cell_feature_attribute_matrix": "CellFeatureData", + "cell_feature_attribute_matrix_path": "CellFeatureData", "output_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "feature_ids": "", + "feature_ids_path": "", "max_voxel": [ 549, 399, @@ -75,7 +75,7 @@ "remove_original_geometry": true, "renumber_features": false, "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", - "update_origin": true + "use_physical_bounds": false }, "comments": "", "filter": { @@ -137,7 +137,7 @@ "image_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/IPF_Unexposed_001", "input_image_geometry_path": "Cugrid_after 2nd_15kv_2kx_2", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -151,10 +151,10 @@ "cell_euler_angles_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/EulerAngles", "cell_phases_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Phases", "crystal_structures_array_path": "Cugrid_after 2nd_15kv_2kx_2/Phase Data/CrystalStructures", - "generation_algorithm": 0, + "generation_algorithm_index": 0, "mask_array_path": "Cugrid_after 2nd_15kv_2kx_2/EBSD Scan Data/Mask", "output_image_geometry_path": "PoleFigure", - "image_layout": 2, + "image_layout_index": 2, "image_prefix": "Cugrid_after 2nd_15kv_2kx_2_Unexposed_", "image_size": 1024, "lambert_size": 64, diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index 069c9cd1fc..5b5f7234d9 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -56,7 +56,7 @@ 1.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", @@ -111,7 +111,7 @@ "comparison_data_path": "fw-ar-IF1-aptr12-corr/Cell Data/Error", "loop": true, "min_confidence": 0.0, - "selected_comparison": 0, + "comparison_index": 0, "input_image_geometry_path": "fw-ar-IF1-aptr12-corr" }, "comments": "", @@ -148,7 +148,7 @@ "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_001", "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -184,7 +184,7 @@ "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_010", "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -220,7 +220,7 @@ "image_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/IPF_100", "input_image_geometry_path": "fw-ar-IF1-aptr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -382,9 +382,9 @@ "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", "feature_ids_path": "fw-ar-IF1-aptr12-corr/Cell Data/FeatureIds", "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "g_beuclidean_distances_array_path": "CellData/GBEuclideanDistances", + "gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances", "quats_array_path": "fw-ar-IF1-aptr12-corr/Cell Data/Quats", - "reference_orientation": 0 + "reference_orientation_index": 0 }, "comments": "", "filter": { @@ -396,7 +396,7 @@ { "args": { "cell_feature_attribute_matrix_path": "fw-ar-IF1-aptr12-corr/CellFeatureData", - "delimiter_choice_int": 2, + "delimiter_index": 2, "feature_data_file": "Data/Output/fw-ar-IF1-aptr12-corr/FeatureData.csv", "write_neighborlist_data": false, "write_num_features_line": true @@ -431,11 +431,11 @@ { "args": { "output_path": "Data/Output/fw-ar-IF1-aptr12-corr/EqDiamHistogram.csv", - "delimiter": 2, + "delimiter_index": 2, "file_extension": ".csv", - "includes": 1, + "header_option_index": 1, "max_val_per_line": 0, - "output_style": 1, + "output_style_index": 1, "input_data_array_paths": [ "fw-ar-IF1-aptr12-corr/Histograms/EquivalentDiameters Histogram" ] diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index 0462e8c707..83cb81512f 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -56,7 +56,7 @@ 1.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", @@ -111,7 +111,7 @@ "comparison_data_path": "fw-ar-IF1-avtr12-corr/Cell Data/Error", "loop": true, "min_confidence": 0.0, - "selected_comparison": 0, + "comparison_index": 0, "input_image_geometry_path": "fw-ar-IF1-avtr12-corr" }, "comments": "", @@ -148,7 +148,7 @@ "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_001", "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -184,7 +184,7 @@ "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_010", "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -220,7 +220,7 @@ "image_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/IPF_100", "input_image_geometry_path": "fw-ar-IF1-avtr12-corr", "index_offset": 0, - "plane": 0 + "plane_index": 0 }, "comments": "", "filter": { @@ -382,9 +382,9 @@ "feature_avg_misorientations_array_name": "FeatureAvgMisorientations", "feature_ids_path": "fw-ar-IF1-avtr12-corr/Cell Data/FeatureIds", "feature_reference_misorientations_array_name": "FeatureReferenceMisorientations", - "g_beuclidean_distances_array_path": "CellData/GBEuclideanDistances", + "gb_euclidean_distances_array_path": "CellData/GBEuclideanDistances", "quats_array_path": "fw-ar-IF1-avtr12-corr/Cell Data/Quats", - "reference_orientation": 0 + "reference_orientation_index": 0 }, "comments": "", "filter": { @@ -396,7 +396,7 @@ { "args": { "cell_feature_attribute_matrix_path": "fw-ar-IF1-avtr12-corr/CellFeatureData", - "delimiter_choice_int": 2, + "delimiter_index": 2, "feature_data_file": "Data/Output/fw-ar-IF1-avtr12-corr/FeatureData.csv", "write_neighborlist_data": false, "write_num_features_line": true @@ -431,12 +431,12 @@ { "args": { "output_path": "Data/Output/fw-ar-IF1-avtr12-corr/EqDiamHistogram.csv", - "delimiter": 2, + "delimiter_index": 2, "file_extension": ".csv", "output_dir": "", - "includes": 1, + "header_option_index": 1, "max_val_per_line": 0, - "output_style": 1, + "output_style_index": 1, "input_data_array_paths": [ "fw-ar-IF1-avtr12-corr/Histograms/EquivalentDiametersHistogram" ] diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp index 33832bed97..8a7095ed77 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMisorientationFilter.cpp @@ -70,7 +70,7 @@ Parameters AlignSectionsMisorientationFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MisorientationTolerance_Key, "Misorientation Tolerance (Degrees)", "Tolerance used to decide if Cells above/below one another should be considered to be the same. The value selected should be similar to the " "tolerance one would use to define Features (i.e., 2-10 degrees)", @@ -78,20 +78,20 @@ Parameters AlignSectionsMisorientationFilter::parameters() const params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Whether to remove some Cells from consideration in the alignment process", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the DataArray Mask", DataPath({"Mask"}), + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Path to the DataArray Mask", DataPath({"Mask"}), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath({"Quats"}), + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath({"Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath({"Phases"}), + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each cell belongs", DataPath({"Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp index 09749ee130..027f4d1c01 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/AlignSectionsMutualInformationFilter.cpp @@ -56,7 +56,7 @@ Parameters AlignSectionsMutualInformationFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MisorientationTolerance_Key, "Misorientation Tolerance", "Tolerance used to decide if Cells above/below one another should be considered to be the same. The value selected should be similar to the " "tolerance one would use to define Features (i.e., 2-10 degrees).", @@ -64,19 +64,20 @@ Parameters AlignSectionsMutualInformationFilter::parameters() const params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Whether to remove some Cells from consideration in the alignment process.", true)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Specifies if the Cell is to be counted in the algorithm. Only required if Use Mask Array is checked.", - DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", + "Specifies if the Cell is to be counted in the algorithm. Only required if Use Mask Array is checked.", DataPath{}, + ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation.", DataPath{}, + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs.", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp index e56da090e8..d610ac8c71 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/BadDataNeighborOrientationCheckFilter.cpp @@ -60,22 +60,22 @@ Parameters BadDataNeighborOrientationCheckFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MisorientationTolerance_Key, "Misorientation Tolerance (Degrees)", "Angular tolerance used to compare with neighboring Cells", 5.0f)); params.insert(std::make_unique(k_NumberOfNeighbors_Key, "Required Number of Neighbors", "Minimum number of neighbor Cells that must have orientations within above tolerance to allow Cell to be changed", 6)); params.insert( std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Cell Data"}); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Used to define Cells as good or bad", DataPath{}, + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Used to define Cells as good or bad", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each phase", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp index 47a61f9804..92abb401b8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CAxisSegmentFeaturesFilter.cpp @@ -55,28 +55,31 @@ Parameters CAxisSegmentFeaturesFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The path to the input image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_MisorientationTolerance_Key, "C-Axis Misorientation Tolerance (Degrees)", "Tolerance (in degrees) used to determine if neighboring Cells belong to the same Feature", 5.0f)); + params.insert(std::make_unique(k_RandomizeFeatureIds_Key, "Randomize Feature Ids", "Specifies whether to randomize the feature ids", true)); + + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter( std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether to use a boolean array to exclude some Cells from the Feature identification process", true)); - params.insert(std::make_unique(k_RandomizeFeatureIds_Key, "Randomize Feature Ids", "Specifies whether to randomize the feature ids", true)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Specifies if the Cell is to be counted in the algorithm. Only required if Use Mask Array is checked", + DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", "FeatureIds")); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Specifies if the Cell is to be counted in the algorithm. Only required if Use Mask Array is checked", - DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Cell Feature Data"}); - params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Feature Ids", "Specifies to which Feature each Cell belongs", "FeatureIds")); - params.insert( - std::make_unique(k_CellFeatureAttributeMatrixName_Key, "Cell Feature Attribute Matrix", "The name of the created feature attribute matrix", "CellFeatureData")); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixName_Key, "Feature Attribute Matrix", "The name of the created feature attribute matrix", "CellFeatureData")); params.insert(std::make_unique( k_ActiveArrayName_Key, "Active", "Specifies if the Feature is still in the sample (true if the Feature is in the sample and false if it is not). At the end of the Filter, all Features will be Active", "Active")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp index cb46c05788..27932e0500 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertHexGridToSquareGridFilter.cpp @@ -82,7 +82,7 @@ Parameters ConvertHexGridToSquareGridFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Orientation Source Data"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_MultipleFiles_Key, "Convert Multiple Files", "True=Convert a list of files, False, just convert a single file", false)); params.insert(std::make_unique(k_Spacing_Key, "Spacing", "Specifies the new spacing values", std::vector{1.0f, 1.0f}, std::vector{"X", "Y"})); params.insert(std::make_unique(k_InputPath_Key, "Input File", "Path to the single file to convert", fs::path("input.ang"), FileSystemPathParameter::ExtensionsType{".ang"}, @@ -91,7 +91,7 @@ Parameters ConvertHexGridToSquareGridFilter::parameters() const "The values that are used to generate the input file list. See GeneratedFileListParameter for more information.", GeneratedFileListParameter::ValueType{})); - params.insertSeparator(Parameters::Separator{"Output Parameters"}); + params.insertSeparator(Parameters::Separator{"Output File"}); params.insert(std::make_unique(k_OutputPath_Key, "Output Directory", "The path to store the converted file. Should NOT be in the same directory.", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputDir, true)); params.insert(std::make_unique(k_OutputPrefix_Key, "Output Prefix", "A string to prepend the name of each converted file", "Sqr_")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp index 0e7eae64f7..d268fd6b74 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertOrientationsFilter.cpp @@ -337,7 +337,7 @@ Parameters ConvertOrientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputType_Key, "Input Orientation Type", "Specifies the incoming orientation representation", 0, OrientationConverterType::GetOrientationTypeStrings())); params.insert(std::make_unique(k_OutputType_Key, "Output Orientation Type", "Specifies to which orientation representation to convert the incoming data", 1, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp index 43d1e84cb9..ac52e342e4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ConvertQuaternionFilter.cpp @@ -62,7 +62,7 @@ Parameters ConvertQuaternionFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_DeleteOriginalData_Key, "Delete Original Data", "Should the original quaternions array be deleted from the DataStructure", false)); params.insert(std::make_unique(k_ConversionType_Key, "Conversion Type", "The conversion type: To Scalar Vector=0, To Vector Scalar=1", 0, k_Choices)); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp index 512784b699..623adc149c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/CreateEnsembleInfoFilter.cpp @@ -44,7 +44,7 @@ std::string CreateEnsembleInfoFilter::humanName() const //------------------------------------------------------------------------------ std::vector CreateEnsembleInfoFilter::defaultTags() const { - return {className(), "Processing", "Generation"}; + return {className(), "Processing", "Generation", "EBSD", "Phae", "Create", "Generate"}; } //------------------------------------------------------------------------------ @@ -52,11 +52,11 @@ Parameters CreateEnsembleInfoFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( k_Ensemble_Key, "Created Ensemble Info", "The values with which to populate the crystal structures, phase types, and phase names data arrays. Each row corresponds to an ensemble phase.", EnsembleInfoParameter::ValueType{})); - params.insertSeparator(Parameters::Separator{"Created Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", "The complete path to the attribute matrix in which to store the ensemble phase data arrays", DataPath({"EnsembleAttributeMatrix"}))); params.insert(std::make_unique(k_CrystalStructuresArrayName_Key, "Crystal Structures", "The name of the data array representing the crystal structure for each Ensemble", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp index a2e5ca88a4..c39c09534a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.cpp @@ -63,34 +63,34 @@ Parameters EBSDSegmentFeaturesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Segmentation Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MisorientationTolerance_Key, "Misorientation Tolerance (Degrees)", "Tolerance (in degrees) used to determine if neighboring Cells belong to the same Feature", 5.0f)); params.insert(std::make_unique(k_RandomizeFeatures_Key, "Randomize Feature IDs", "Specifies if feature IDs should be randomized during calculations", false)); params.insertLinkableParameter( std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether to use a boolean array to exclude some Cells from the Feature identification process", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the data array that specifies if the Cell is to be counted in the algorithm", DataPath(), + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Path to the data array that specifies if the Cell is to be counted in the algorithm", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Input Grid Geometry", "DataPath to input Grid Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image, IGeometry::Type::RectGrid})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs.", "FeatureIds")); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert( - std::make_unique(k_CellFeatureAttributeMatrixName_Key, "Cell Feature Attribute Matrix", "The name of the created cell feature attribute matrix", "CellFeatureData")); + std::make_unique(k_CellFeatureAttributeMatrixName_Key, "Feature Attribute Matrix", "The name of the created cell feature attribute matrix", "CellFeatureData")); params.insert(std::make_unique(k_ActiveArrayName_Key, "Active", "The name of the array which specifies if the Feature is still in the sample (true if the Feature is in the sample and false if it is not). " "At the end of the Filter, all Features will be Active", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp index 2fb524c912..e5e1685c82 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EbsdToH5EbsdFilter.cpp @@ -51,7 +51,7 @@ std::vector EbsdToH5EbsdFilter::defaultTags() const Parameters EbsdToH5EbsdFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Conversion Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing between each slice of data", 1.0F)); params.insert(std::make_unique(k_StackingOrder_Key, "Stacking Order", "The order the files should be placed into the ", EbsdToH5EbsdInputConstants::k_LowToHigh, EbsdToH5EbsdInputConstants::k_StackingChoices)); @@ -59,11 +59,11 @@ Parameters EbsdToH5EbsdFilter::parameters() const "The reference frame transformation. 0=EDAX(.ang), 1=Oxford(.ctf), 2=No/Unknown Transformation, 3=HEDM-IceNine", EbsdToH5EbsdInputConstants::k_Edax, EbsdToH5EbsdInputConstants::k_TransformChoices)); - params.insertSeparator(Parameters::Separator{"Output Parameters"}); + params.insertSeparator(Parameters::Separator{"Output File"}); params.insert(std::make_unique(k_OutputPath_Key, "Output H5Ebsd File", "The path to the generated .h5ebsd file", fs::path(""), FileSystemPathParameter::ExtensionsType{".h5ebsd"}, FileSystemPathParameter::PathType::OutputFile, true)); - params.insertSeparator(Parameters::Separator{"Orientation Source Data"}); + params.insertSeparator(Parameters::Separator{"Input Data Files"}); params.insert(std::make_unique(k_InputFileListInfo_Key, "Input File List", "The values that are used to generate the input file list. See GeneratedFileListParameter for more information.", GeneratedFileListParameter::ValueType{})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp index b80543a4e9..bd3fd4e15b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgCAxesFilter.cpp @@ -49,20 +49,19 @@ Parameters FindAvgCAxesFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Input quaternion array", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Input quaternion array", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); - params.insert( - std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_AvgCAxesArrayName_Key, "Average C-Axes", "The output average C-Axis values for each feature", "AvgCAxes")); return params; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp index 209bb069ec..c9c844bb6a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindAvgOrientationsFilter.cpp @@ -62,7 +62,7 @@ Parameters FindAvgOrientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Element Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs.", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"CellData", "Phases"}), @@ -75,9 +75,9 @@ Parameters FindAvgOrientationsFilter::parameters() const DataPath({"CellEnsembleData", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath({"CellFeatureData"}))); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_AvgQuatsArrayName_Key, "Average Quaternions", "The name of the array specifying the average orientation of the Feature in quaternion representation", "AvgQuats")); params.insert(std::make_unique(k_AvgEulerAnglesArrayName_Key, "Average Euler Angles", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp index c8dd6d24a3..5638174b78 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindBoundaryStrengthsFilter.cpp @@ -52,26 +52,26 @@ Parameters FindBoundaryStrengthsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Loading_Key, "Loading Direction (XYZ)", "The loading axis for the sample", std::vector{0.0, 0.0, 0.0}, std::vector{"x", "y", "z"})); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Data Array that specifies which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Data Array that specifies the average orientation of each Feature in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Data Array that specifies to which Ensemble each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each phase", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Face Data Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_SurfaceMeshF1sArrayName_Key, "F1s", "DataArray Name to store the calculated F1s Values", "F1s")); params.insert(std::make_unique(k_SurfaceMeshF1sptsArrayName_Key, "F1spts", "DataArray Name to store the calculated F1spts Values", "F1s points")); params.insert(std::make_unique(k_SurfaceMeshF7sArrayName_Key, "F7s", "DataArray Name to store the calculated F7s Values", "F7s")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp index 2a919e1fa5..91e4b99c36 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindCAxisLocationsFilter.cpp @@ -51,15 +51,15 @@ Parameters FindCAxisLocationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "DataPath to input quaternion values", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "DataPath to input quaternion values", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_CAxisLocationsArrayName_Key, "C-Axis Locations", "DataPath to calculated C-Axis locations", "CAxisLocation")); return params; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp index a371fcf424..f3d3e6e9db 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureNeighborCAxisMisalignmentsFilter.cpp @@ -53,20 +53,20 @@ Parameters FindFeatureNeighborCAxisMisalignmentsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_FindAvgMisals_Key, "Find Average Misalignment Per Feature", "Whether the average of the C-axis misalignments with the neighboring Features should be stored for each Feature", false)); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_NeighborListArrayPath_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", DataPath{}, NeighborListSelectionParameter::AllowedTypes{DataType::int32})); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Defines the average orientation of the Feature in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each **Feature** belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_CAxisMisalignmentListArrayName_Key, "C-Axis Misalignment List", "List of the C-axis misalignment angles (in degrees) with the contiguous neighboring Features for a given Feature", "CAxisMisalignmentList")); params.insert(std::make_unique(k_AvgCAxisMisalignmentsArrayName_Key, "Average C-Axis Misalignments", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp index da07cd7d76..f5b1f873eb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.cpp @@ -49,27 +49,27 @@ Parameters FindFeatureReferenceCAxisMisorientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The path to the input image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_AvgCAxesArrayPath_Key, "Average C-Axes", "The direction of the Feature's C-axis in the sample reference frame", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_FeatureReferenceCAxisMisorientationsArrayName_Key, "Feature Reference C-Axis Misorientations", "Misorientation angle (in degrees) between Cell's C-axis and the C-axis of the Feature that owns that Cell", "FeatureRefCAxisMisorientation")); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_FeatureAvgCAxisMisorientationsArrayName_Key, "Average C-Axis Misorientations", "Average of the Feature Reference CAxis Misorientation values for all of the Cells that belong to the Feature", "AvgCAxisMisorientation")); params.insert(std::make_unique(k_FeatureStdevCAxisMisorientationsArrayName_Key, "Feature Stdev C-Axis Misorientations", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp index a94590c27f..811dd1af75 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindFeatureReferenceMisorientationsFilter.cpp @@ -53,41 +53,42 @@ Parameters FindFeatureReferenceMisorientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_ReferenceOrientation_Key, "Reference Orientation", "Specifies the reference orientation to use when comparing to each Cell", 0, ChoicesParameter::Choices{"Average Orientation", "Orientation at Feature Centroid"})); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"CellData", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath({"CellData", "Quats"}), - ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", + DataPath({"CellData", "Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, + ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique( k_GBEuclideanDistancesArrayPath_Key, "Boundary Euclidean Distances", "Distance the Cells are from the boundary of the Feature they belong to. Only required if the reference orientation is selected to be the orientation at the Feature centroid", DataPath({"CellData", "GBEuclideanDistances"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique( k_AvgQuatsArrayPath_Key, "Average Quaternions", "Specifies the average orientation of the Feature in quaternion representation (, w). Only required if the reference orientation is selected to be the average of the Feature", DataPath({"CellFeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath({"CellFeatureData"}))); - params.insertSeparator(Parameters::Separator{"Required Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique( k_FeatureReferenceMisorientationsArrayName_Key, "Feature Reference Misorientations", "The name of the array containing the misorientation angle (in degrees) between Cell's orientation and the reference orientation of the Feature that owns that Cell", "FeatureReferenceMisorientations")); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_FeatureAvgMisorientationsArrayName_Key, "Average Misorientations", "The name of the array containing the average of the Feature reference misorientation values for all of the Cells that belong to the Feature", "FeatureAvgMisorientations")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp index a3eefc9033..d96dbb9e7a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDFilter.cpp @@ -52,9 +52,10 @@ Parameters FindGBCDFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_GBCDRes_Key, "GBCD Spacing (Degrees)", "The resolution in degrees for the GBCD calculation", 9.0f)); - params.insertSeparator(Parameters::Separator{"Face Data"}); + + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle Geometry", "Path to the triangle geometry for which to calculate the GBCD", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, @@ -63,17 +64,20 @@ Parameters FindGBCDFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_SurfaceMeshFaceAreasArrayPath_Key, "Face Areas", "Array specifying the area of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Cell Feature Data"}); + + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); + params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", + DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, + ArraySelectionParameter::AllowedComponentShapes{{1}})); + + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_FeatureEulerAnglesArrayPath_Key, "Average Euler Angles", "Array specifying three angles defining the orientation of the Feature in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which phase each Feature belongs", DataPath({"CellFeatureData", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); - params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", - DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, - ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Face Ensemble Data"}); + + params.insertSeparator(Parameters::Separator{"Output Face Ensemble Data"}); params.insert( std::make_unique(k_FaceEnsembleAttributeMatrixName_Key, "Face Ensemble Attribute Matrix", "The name of the created face ensemble attribute matrix", "FaceEnsembleData")); params.insert(std::make_unique(k_GBCDArrayName_Key, "GBCD", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp index e6479e0eb3..d67eb8f132 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBCDMetricBasedFilter.cpp @@ -65,7 +65,7 @@ Parameters FindGBCDMetricBasedFilter::parameters() const } // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_PhaseOfInterest_Key, "Phase of Interest", "Index of the Ensemble for which to compute GBCD; boundaries having grains of this phase on both its sides will only be taken into account", 1)); params.insert(std::make_unique(k_MisorientationRotation_Key, "Fixed Misorientation", @@ -79,26 +79,26 @@ Parameters FindGBCDMetricBasedFilter::parameters() const "Whether or not to save the distribution errors as relative (if exceeds 100%, then rounded down) or absolute", false)); params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The complete path to the triangle geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Vertex Data"}); params.insert(std::make_unique(k_NodeTypesArrayPath_Key, "Node Types", "Specifies the type of node in the Geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Specifies which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insert(std::make_unique(k_SurfaceMeshFaceNormalsArrayPath_Key, "Face Normals", "Specifies the normal of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_SurfaceMeshFaceAreasArrayPath_Key, "Face Areas", "Specifies the area of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Face Feature Data"}); params.insert(std::make_unique(k_SurfaceMeshFeatureFaceLabelsArrayPath_Key, "Feature Face Labels", "Specifies which original Features are on either side of each boundary Feature", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); - params.insertSeparator(Parameters::Separator{"Required Image Geometry Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_FeatureEulerAnglesArrayPath_Key, "Average Euler Angles", "Three angles defining the orientation of the Feature in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which phase each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Image Geometry Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Output Parameters"}); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp index 4a7e339874..47fb116222 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.cpp @@ -54,7 +54,7 @@ Parameters FindGBPDMetricBasedFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_PhaseOfInterest_Key, "Phase of Interest", "Index of the Ensemble for which to compute GBPD; boundaries having grains of this phase on both its sides will only be taken into account", 1)); params.insert(std::make_unique(k_LimitDist_Key, "Limiting Distance [deg.]", "The max angle from within which mesh segments are selected", 7.0f)); @@ -64,26 +64,26 @@ Parameters FindGBPDMetricBasedFilter::parameters() const "Whether or not to save the distribution errors as relative (if exceeds 100%, then rounded down) or absolute", false)); params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The complete path to the triangle geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Vertex Data"}); params.insert(std::make_unique(k_NodeTypesArrayPath_Key, "Node Types", "Specifies the type of node in the Geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Specifies which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insert(std::make_unique(k_SurfaceMeshFaceNormalsArrayPath_Key, "Face Normals", "Specifies the normal of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_SurfaceMeshFaceAreasArrayPath_Key, "Face Areas", "Specifies the area of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Triangle Geometry Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry Face Feature Data"}); params.insert(std::make_unique(k_SurfaceMeshFeatureFaceLabelsArrayPath_Key, "Feature Face Labels", "Specifies which original Features are on either side of each boundary Feature", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); - params.insertSeparator(Parameters::Separator{"Required Image Geometry Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_FeatureEulerAnglesArrayPath_Key, "Average Euler Angles", "Three angles defining the orientation of the Feature in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which phase each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Image Geometry Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Output Parameters"}); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp index 0196bfb391..c96dba6c12 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindKernelAvgMisorientationsFilter.cpp @@ -52,23 +52,24 @@ Parameters FindKernelAvgMisorientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_KernelSize_Key, "Kernel Radius", "Size of the kernel in the X, Y and Z directions (in number of Cells)", std::vector{1, 1, 1}, std::vector{"X", "Y", "Z"})); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "Path to the target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"CellData", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath({"CellData", "Quats"}), - ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Required Ensemble Data"}); + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", + DataPath({"CellData", "Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, + ArraySelectionParameter::AllowedComponentShapes{{4}})); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_KernelAverageMisorientationsArrayName_Key, "Kernel Average Misorientations", "The name of the array containing the average misorientation (in Degrees) for all Cells within the kernel and the central Cell", "KernelAverageMisorientations")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp index 86e3b52f59..78987efc7d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindMisorientationsFilter.cpp @@ -54,7 +54,7 @@ Parameters FindMisorientationsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameter"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_FindAvgMisors_Key, "Find Average Misorientation Per Feature", "Specifies if the average of the misorienations with the neighboring Features should be stored for each Feature", false)); @@ -73,7 +73,7 @@ Parameters FindMisorientationsFilter::parameters() const DataPath({"DataContainer", "CellEnsembleData", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_MisorientationListArrayName_Key, "Misorientation List", "The name of the data object containing the list of the misorientation angles with the contiguous neighboring Features for a given Feature", "MisorientationList")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp index c69a1db792..a6e25eb5ad 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSchmidsFilter.cpp @@ -52,7 +52,7 @@ Parameters FindSchmidsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_LoadingDirection_Key, "Loading Direction", "The loading axis for the sample", std::vector({1.0F, 1.0F, 1.0F}), std::vector({"X", "Y", "Z"}))); @@ -65,18 +65,18 @@ Parameters FindSchmidsFilter::parameters() const params.insert(std::make_unique(k_SlipDirection_Key, "Slip Direction", "Vector defining the slip direction.", std::vector({1.0F, 0.0F, 0.0F}), std::vector({"X", "Y", "Z"}))); - params.insertSeparator(Parameters::Separator{"Required Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath({"CellFeatureData", "Phases"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Specifies the average orienation of each Feature in quaternion representation", DataPath({"CellFeatureData", "AvgQuats"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Required Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{nx::core::DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique( k_SchmidsArrayName_Key, "Schmids", "The name of the array containing the value of the Schmid factor for the most favorably oriented slip system (i.e., the one with the highest Schmid factor)", "Schmids")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp index 62bba06e16..9d632ce39a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindShapesFilter.cpp @@ -52,17 +52,17 @@ Parameters FindShapesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Input Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Feature Centroids", "X, Y, Z coordinates of Feature center of mass", DataPath({"Centroids"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_Omega3sArrayName_Key, "Omega3s", "3rd invariant of the second-order moment matrix for the Feature, does not assume a shape type (i.e., ellipsoid)", "Omega3s")); params.insert(std::make_unique(k_AxisLengthsArrayName_Key, "Axis Lengths", "Semi-axis lengths (a, b, c) for best-fit ellipsoid to Feature", "AxisLengths")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp index 38dec71618..3e5f08dcac 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.cpp @@ -52,22 +52,21 @@ Parameters FindSlipTransmissionMetricsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Feature Data"}); - params.insert(std::make_unique(k_NeighborListArrayPath_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", DataPath{}, - NeighborListSelectionParameter::AllowedTypes{DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Data Array that specifies the average orientation of each Feature in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Data Array that specifies to which Ensemble each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insert(std::make_unique(k_NeighborListArrayPath_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", DataPath{}, + NeighborListSelectionParameter::AllowedTypes{DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each phase", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_F1ListArrayName_Key, "F1 List", "DataArray Name to store the calculated F1s Values", "F1 List")); params.insert(std::make_unique(k_F1sptListArrayName_Key, "F1spt List", "DataArray Name to store the calculated F1spts Values", "F1spt List")); params.insert(std::make_unique(k_F7ListArrayName_Key, "F7 List", "DataArray Name to store the calculated F7s Values", "F7 List")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp index e8fd0c792a..0a1233748c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/FindTriangleGeomShapesFilter.cpp @@ -50,11 +50,11 @@ Parameters FindTriangleGeomShapesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); @@ -63,7 +63,7 @@ Parameters FindTriangleGeomShapesFilter::parameters() const params.insert(std::make_unique(k_VolumesArrayPath_Key, "Face Feature Volumes", "Input DataPath to the **Feature Volumes** for the face data", DataPath({"FaceFeatureData", "Volumes"}), ArraySelectionParameter::AllowedTypes{DataType::float32})); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_Omega3sArrayName_Key, "Omega3s", "The name of the DataArray that holds the calculated Omega3 values", "Omega3s")); params.insert(std::make_unique(k_AxisLengthsArrayName_Key, "Axis Lengths", "The name of the DataArray that holds the calculated Axis Lengths values", "AxisLengths")); params.insert(std::make_unique(k_AxisEulerAnglesArrayName_Key, "Axis Euler Angles", "The name of the DataArray that holds the calculated Axis Euler Angles values", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternionsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternionsFilter.cpp index a99101194f..70a764be57 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternionsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFZQuaternionsFilter.cpp @@ -151,21 +151,22 @@ Parameters GenerateFZQuaternionsFilter::parameters() const names.pop_back(); // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Element Data"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_QuatsArrayPath_Key, "Input Quaternions", "The input quaternions to convert.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Input Phases", "The phases of the data. The data should be the indices into the Crystal Structures Data Array.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter( std::make_unique(k_UseMask_Key, "Apply to Good Elements Only (Bad Elements Will Be Black)", "Whether to assign a black color to 'bad' Elements", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Input Mask [Optional]", "Optional Mask array where valid data is TRUE or 1.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int8, DataType::uint8, DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Element Data"}); + params.insertSeparator(Parameters::Separator{"Output Data"}); params.insert(std::make_unique(k_FZQuatsArrayName_Key, "Created FZ Quaternions", "The name of the array containing the Quaternion that represents an orientation within the fundamental zone for each Element", "")); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp index 1977489493..bbb8d5f89b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFaceIPFColoringFilter.cpp @@ -51,20 +51,20 @@ Parameters GenerateFaceIPFColoringFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Specifies which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); params.insert(std::make_unique(k_SurfaceMeshFaceNormalsArrayPath_Key, "Face Normals", "Specifies the normal of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_FeatureEulerAnglesArrayPath_Key, "Average Euler Angles", "Three angles defining the orientation of the Feature in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which phase each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert( std::make_unique(k_SurfaceMeshFaceIPFColorsArrayName_Key, "IPF Colors", "A set of two RGB color schemes encoded as unsigned chars for each Face", "FaceIPFColors")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFeatureFaceMisorientationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFeatureFaceMisorientationFilter.cpp index dd717df34a..b6389c4826 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFeatureFaceMisorientationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateFeatureFaceMisorientationFilter.cpp @@ -51,18 +51,18 @@ Parameters GenerateFeatureFaceMisorientationFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Specifies which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Specifies the average orientation of each Feature in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which phase each Feature belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceMisorientationColorsArrayName_Key, "Misorientation Colors", "A set of RGB color schemes encoded as floats for each Face", "FaceMisorientationColors")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp index 555ebe1a2f..9dce8d8035 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.cpp @@ -55,12 +55,12 @@ Parameters GenerateGBCDPoleFigureFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_PhaseOfInterest_Key, "Phase of Interest", "Index of the Ensemble for which to plot the pole figure", 1)); params.insert(std::make_unique(k_MisorientationRotation_Key, "Misorientation Angle-Axis", "Angle-Axis values for drawing GBCD", std::vector{60.0F, 1.0F, 1.0F, 1.0F}, std::vector{"Angle (Deg)", "h", "k", "l"})); params.insert(std::make_unique(k_OutputImageDimension_Key, "Output Image Dimension", "The value to use for the dimensions for the image geometry", 100)); - params.insertSeparator(Parameters::Separator{"Required Face Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Ensemble Data"}); params.insert(std::make_unique(k_GBCDArrayPath_Key, "Input GBCD", "5 parameter GBCD data. The 6th component is used internally to track the northern vs. southern hemisphere of the Lambert sphere", DataPath({"FaceEnsembleData", "GBCD"}), ArraySelectionParameter::AllowedTypes{DataType::float64})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp index d0266d853f..5a4741da95 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateIPFColorsFilter.cpp @@ -63,28 +63,28 @@ Parameters GenerateIPFColorsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ReferenceDir_Key, "Reference Direction", "The reference axis with respect to compute the IPF colors", std::vector{0.0F, 0.0F, 1.0F}, std::vector(3))); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Whether to assign a black color to 'bad' Elements", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the data array used to define Elements as good or bad.", DataPath(), + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Path to the data array used to define Elements as good or bad.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Cell Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert( std::make_unique(k_CellIPFColorsArrayName_Key, "IPF Colors", "The name of the array containing the RGB colors encoded as unsigned chars for each Element", "IPFColors")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp index c4c076d140..be1b40ddf4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.cpp @@ -57,13 +57,13 @@ std::vector GenerateQuaternionConjugateFilter::defaultTags() const Parameters GenerateQuaternionConjugateFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_DeleteOriginalData_Key, "Delete Original Data", "Should the original Data be deleted from the DataStructure", false)); params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_CellQuatsArrayPath_Key, "Quaternions", "Specifies the quaternions to convert", DataPath({"CellData", "Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Created Data"}); + params.insertSeparator(Parameters::Separator{"Output Data"}); params.insert( std::make_unique(k_OutputDataArrayName_Key, "Created Quaternion Conjugate", "The name of the generated quaternion conjugate array", "Quaternions [Conjugate]")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp index e8e1b1c361..b99c5a8020 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/MergeTwinsFilter.cpp @@ -58,12 +58,12 @@ Parameters MergeTwinsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "MergeTwins SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_UseNonContiguousNeighbors_Key, "Use Non-Contiguous Neighbors", "Whether to use a list of non-contiguous or contiguous neighbors for each feature when merging", false)); @@ -72,11 +72,11 @@ Parameters MergeTwinsFilter::parameters() const params.insert(std::make_unique(k_AngleTolerance_Key, "Angle Tolerance (Degrees)", "Tolerance allowed when comparing the angle part of the axis-angle representation of the misorientation", 2.0F)); - params.insertSeparator(Parameters::Separator{"Required Element Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_ContiguousNeighborListArrayPath_Key, "Contiguous Neighbor List", "List of contiguous neighbors for each Feature.", DataPath({"NeighborList2"}), NeighborListSelectionParameter::AllowedTypes{DataType::int32})); params.insert(std::make_unique(k_NonContiguousNeighborListArrayPath_Key, "Non-Contiguous Neighbor List", "List of non-contiguous neighbors for each Feature.", @@ -89,15 +89,15 @@ Parameters MergeTwinsFilter::parameters() const params.insert(std::make_unique(k_AvgQuatsArrayPath_Key, "Average Quaternions", "Specifies the average orientation of each Feature in quaternion representation", DataPath({"Quats"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Required Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Element Data"}); + params.insertSeparator(Parameters::Separator{"Output Element Data"}); params.insert(std::make_unique(k_CellParentIdsArrayName_Key, "Parent Ids", "The name of the array specifying to which parent each cell belongs", "ParentIds")); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert( std::make_unique(k_CreatedFeatureAttributeMatrixName_Key, "Feature Attribute Matrix", "The name of the created cell feature attribute matrix", "NewGrain Data")); params.insert(std::make_unique(k_FeatureParentIdsArrayName_Key, "Parent Ids", "The name of the array specifying to which parent each Feature belongs", "ParentIds")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp index 8b27648a31..f398d853a3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.cpp @@ -60,20 +60,20 @@ Parameters NeighborOrientationCorrelationFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MinConfidence_Key, "Minimum Confidence Index", "Sets the minimum value of 'confidence' a Cell must have", 0.1f)); params.insert(std::make_unique(k_MisorientationTolerance_Key, "Misorientation Tolerance (Degrees)", "Angular tolerance used to compare with neighboring Cells", 5.0f)); params.insert(std::make_unique(k_Level_Key, "Cleanup Level", "Minimum number of neighbor Cells that must have orientations within above tolerance to allow Cell to be changed", 6)); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "Path to the target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CorrelationArrayPath_Key, "Confidence Index", "Specifies the confidence in the orientation of the Cell (TSL data)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath({"Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_QuatsArrayPath_Key, "Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, + params.insert(std::make_unique(k_QuatsArrayPath_Key, "Cell Quaternions", "Specifies the orientation of the Cell in quaternion representation", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{4}})); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index 08033e9494..c717d2c4ba 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -59,17 +59,15 @@ Parameters ReadAngDataFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input .ang file path", fs::path("input.ang"), FileSystemPathParameter::ExtensionsType{".ang"}, FileSystemPathParameter::PathType::InputFile)); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); - + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index a9e95e2521..ad0a8dce05 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -62,21 +62,19 @@ Parameters ReadCtfDataFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input .ctf file path", fs::path("input.ctf"), FileSystemPathParameter::ExtensionsType{".ctf"}, FileSystemPathParameter::PathType::InputFile)); params.insert(std::make_unique(k_DegreesToRadians_Key, "Convert Euler Angles to Radians", "Whether or not to convert the Euler angles to Radians", false)); params.insert(std::make_unique(k_EdaxHexagonalAlignment_Key, "Convert Hexagonal X-Axis to EDAX Standard", "Whether or not to convert a Hexagonal phase to the EDAX standard for x-axis alignment", false)); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); - + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index 21518df5bd..32d8bd1a1f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -55,14 +55,14 @@ Parameters ReadEnsembleInfoFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input Ensemble Info File", "The path to the ini formatted input file", fs::path("DefaultInputFileName"), FileSystemPathParameter::ExtensionsType{".ini", ".txt"}, FileSystemPathParameter::PathType::InputFile)); DataGroupSelectionParameter::AllowedTypes allowedGroupTypes = BaseGroup::GetAllGeometryGroupTypes(); allowedGroupTypes.insert(BaseGroup::GroupType::DataGroup); params.insert(std::make_unique(k_ParentGroupPath_Key, "Data Container", "The path to the data object in which the ensemble information will be stored", DataPath{}, allowedGroupTypes)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert( std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The name of the created Ensemble Attribute Matrix", "EnsembleAttributeMatrix")); params.insert(std::make_unique(k_CrystalStructuresArrayName_Key, "Crystal Structures", "The name of the created array representing the crystal structure for each Ensemble", diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index ea81f7986f..5e2b587395 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -59,16 +59,16 @@ Parameters ReadH5EbsdFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", ReadH5EbsdFileParameter::ValueType{})); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); - params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the created cell attribute matrix associated with the imported geometry", + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); + params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); + params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index 8d8e0e0a38..8a01b54fd4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -65,7 +65,7 @@ Parameters ReadH5EspritDataFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedScanNames_Key, "Scan Names", "The name of the scan(s) in the .h5 file. Esprit can store multiple scans in a single file", OEMEbsdScanSelectionParameter::ValueType{}, /* OEMEbsdScanSelectionParameter::AllowedManufacturers{EbsdLib::OEM::Bruker, EbsdLib::OEM::DREAM3D},*/ @@ -74,12 +74,12 @@ Parameters ReadH5EspritDataFilter::parameters() const params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_DegreesToRadians_Key, "Convert Euler Angles to Radians", "Whether or not to convert the euler angles to radians", true)); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index df60b1e3e9..f266249329 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -63,19 +63,19 @@ Parameters ReadH5OimDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedScanNames_Key, "Scan Names", "The name of the scan in the .h5 file. EDAX can store multiple scans in a single file", OEMEbsdScanSelectionParameter::ValueType{}, OEMEbsdScanSelectionParameter::EbsdReaderType::Oim, OEMEbsdScanSelectionParameter::ExtensionsType{".h5"})); params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp index a08481e7e5..e8761110db 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OinaDataFilter.cpp @@ -62,7 +62,7 @@ Parameters ReadH5OinaDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedScanNames_Key, "Scan Names", "The name of the scan in the .h5oina file. Oxford can store multiple scans in a single file", OEMEbsdScanSelectionParameter::ValueType{}, OEMEbsdScanSelectionParameter::EbsdReaderType::H5Oina, OEMEbsdScanSelectionParameter::ExtensionsType{".h5oina"})); @@ -72,12 +72,12 @@ Parameters ReadH5OinaDataFilter::parameters() const params.insert(std::make_unique(k_ZSpacing_Key, "Z Spacing (Microns)", "The spacing in microns between each layer.", 1.0f)); params.insert(std::make_unique(k_Origin_Key, "Origin", "The origin of the volume", std::vector{0.0F, 0.0F, 0.0F}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ReadPatternData_Key, "Import Pattern Data", "Whether or not to import the pattern data", false)); - params.insertSeparator(Parameters::Separator{"Create Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "The path to the created Image Geometry", DataPath({ImageGeom::k_TypeName}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The name of the cell data attribute matrix for the created Image Geometry", ImageGeom::k_CellDataName)); - params.insertSeparator(Parameters::Separator{"Created Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Attribute Matrix"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixName_Key, "Ensemble Attribute Matrix", "The Attribute Matrix where the phase information is stored.", "Cell Ensemble Data")); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp index 3b3c92a503..37a9d4d689 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RodriguesConvertorFilter.cpp @@ -57,7 +57,7 @@ Parameters RodriguesConvertorFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_DeleteOriginalData_Key, "Delete Original Data", "Should the original Rodrigues data array be deleted from the DataStructure", false)); params.insertSeparator(Parameters::Separator{"Input Data"}); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp index 712691c542..1e4de6f403 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/RotateEulerRefFrameFilter.cpp @@ -49,7 +49,7 @@ Parameters RotateEulerRefFrameFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_RotationAxisAngle_Key, "Rotation Axis-Angle [w]", "Axis-Angle in sample reference frame to rotate about.", VectorFloat32Parameter::ValueType{0.0f, 0.0f, 0.0f, 90.0F}, std::vector{"i", "j", "k", "w (Deg)"})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp index 38604b8a2d..4da3b7997e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp @@ -55,13 +55,13 @@ Parameters WriteGBCDGMTFileFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_PhaseOfInterest_Key, "Phase of Interest", "Index of the Ensemble for which to plot the pole figure", 1)); params.insert(std::make_unique(k_MisorientationRotation_Key, "Misorientation Axis-Angle", "Axis-Angle pair values for drawing GBCD", std::vector(4, 0), std::vector{"Angle", "h", "k", "l"})); params.insert(std::make_unique(k_OutputFile_Key, "Output GMT File", "The output .dat file path", FileSystemPathParameter::ValueType{}, FileSystemPathParameter::ExtensionsType{".dat"}, FileSystemPathParameter::PathType::OutputFile, false)); - params.insertSeparator(Parameters::Separator{"Required Face Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Ensemble Data"}); params.insert(std::make_unique(k_GBCDArrayPath_Key, "GBCD", "5 parameter GBCD data. The 6th component is used internally to track the northern vs. southern hemisphere of the Lambert sphere", DataPath({"FaceEnsembleData", "GBCD"}), ArraySelectionParameter::AllowedTypes{DataType::float64})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp index 80bb68d658..d71deb774a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp @@ -54,10 +54,10 @@ Parameters WriteGBCDTriangleDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File", "The output GBCD triangle file path", "", FileSystemPathParameter::ExtensionsType{".ph"}, FileSystemPathParameter::PathType::OutputFile)); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Specifies which Features are on either side of each Face", DataPath({"[Triangle Geometry]", "FaceData", "FaceLabels"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{2}})); @@ -67,7 +67,7 @@ Parameters WriteGBCDTriangleDataFilter::parameters() const params.insert(std::make_unique(k_SurfaceMeshFaceAreasArrayPath_Key, "Face Areas", "Specifies the area of each Face", DataPath({"[Triangle Geometry]", "FaceData", "FaceAreas"}), ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique( k_FeatureEulerAnglesArrayPath_Key, "Average Euler Angles", "Three angles defining the orientation of the Feature in Bunge convention (Z-X-Z).", DataPath({"[Image Geometry]", "CellFeatureData", "AvgEulerAngles"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp index 6dc62bc94b..f14799ef62 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp @@ -55,23 +55,23 @@ Parameters WriteINLFileFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File", "The output .inl file path", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); - params.insertSeparator(Parameters::Separator{"Required Parent Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert( std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "The selected image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Cell belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", "Three angles defining the orientation of the Cell in Bunge convention (Z-X-Z)", DataPath{}, - ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); + params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Cell Euler Angles", "Three angles defining the orientation of the Cell in Bunge convention (Z-X-Z)", + DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Required Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_MaterialNameArrayPath_Key, "Material Names", "Name of each Ensemble", DataPath{})); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp index cdb24ac7a0..c10473cec7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp @@ -83,7 +83,7 @@ Parameters WritePoleFigureFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Title_Key, "Figure Title", "The title to place at the top of the Pole Figure", "Figure Title")); params.insert(std::make_unique(k_ImageSize_Key, "Image Size (Square Pixels)", "The number of pixels that define the height and width of **each** output pole figure", 512)); params.insert(std::make_unique(k_ImageLayout_Key, "Image Layout", "How to layout the 3 pole figures. 0=Horizontal, 1=Vertical, 2=Square", 0, @@ -94,22 +94,22 @@ Parameters WritePoleFigureFilter::parameters() const params.insert(std::make_unique(k_LambertSize_Key, "Lambert Image Size (Pixels)", "The height/width of the internal Lambert Square that is used for interpolation", 64)); params.insert(std::make_unique(k_NumColors_Key, "Number of Colors", "The number of colors to use for the Color Intensity pole figures", 32)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); - params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Cell Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Should the algorithm use a mask array to remove non-indexed points", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the input Mask DataArray", DataPath({"Mask"}), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CrystalStructuresArrayPath_Key, "Crystal Structures", "Enumeration representing the crystal structure for each Ensemble", DataPath({"Ensemble Data", "CrystalStructures"}), ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_MaterialNameArrayPath_Key, "Material Name", "DataPath to the input DataArray that holds the material names", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Objects/Output File Parameters"}); + params.insertSeparator(Parameters::Separator{"Output File Parameters"}); params.insertLinkableParameter(std::make_unique(k_WriteImageToDisk, "Write Pole Figure as Image", "Should the filter write the pole figure plots to a file.", true)); params.insert(std::make_unique(k_OutputPath_Key, "Output Directory Path", @@ -118,8 +118,9 @@ Parameters WritePoleFigureFilter::parameters() const params.insert( std::make_unique(k_ImagePrefix_Key, "Pole Figure File Prefix", "The prefix to apply to each generated pole figure. Each Phase will have its own pole figure.", "Phase_")); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insertLinkableParameter(std::make_unique(k_SaveAsImageGeometry_Key, "Save Output as Image Geometry", "Save the generated pole figure as an ImageGeometry", true)); - params.insert(std::make_unique(k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"PoleFigure"}))); + params.insert(std::make_unique(k_ImageGeometryPath_Key, "Output Image Geometry", "The path to the created Image Geometry", DataPath({"PoleFigure"}))); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp index c8e10cccd1..50d692d809 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp @@ -55,7 +55,7 @@ Parameters WriteStatsGenOdfAngleFileFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File", "The output angles file path", fs::path("Data/Output/StatsGenODF.txt"), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); params.insert(std::make_unique(k_Weight_Key, "Default Weight", "This value will be used for the Weight column", 1.0f)); @@ -72,7 +72,7 @@ Parameters WriteStatsGenOdfAngleFileFilter::parameters() const params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Used to define Elements as good or bad. Only required if Only Write Good Elements is checked", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Element Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", "Three angles defining the orientation of the Element in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Element belongs", DataPath{}, diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index b0f68842e7..841a103e6d 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -394,6 +394,7 @@ if(TARGET ITKImageProcessing) "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/TxCopper_Unexposed.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/aptr12_Analysis.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/avtr12_Analysis.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/EBSD_Hexagonal_Data_Analysis.d3dpipeline" ) endif() diff --git a/src/Plugins/SimplnxCore/CMakeLists.txt b/src/Plugins/SimplnxCore/CMakeLists.txt index 3a15ef4cb3..dcede4e9e2 100644 --- a/src/Plugins/SimplnxCore/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/CMakeLists.txt @@ -60,7 +60,7 @@ set(FilterList FindLargestCrossSectionsFilter FindNeighborhoodsFilter FindNeighborListStatisticsFilter - FindNeighborsFilter + FindFeatureNeighborsFilter FindNumFeaturesFilter FindSurfaceAreaToVolumeFilter FindSurfaceFeaturesFilter diff --git a/src/Plugins/SimplnxCore/docs/FindNeighborsFilter.md b/src/Plugins/SimplnxCore/docs/FindFeatureNeighborsFilter.md similarity index 100% rename from src/Plugins/SimplnxCore/docs/FindNeighborsFilter.md rename to src/Plugins/SimplnxCore/docs/FindFeatureNeighborsFilter.md diff --git a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline index b7300812c5..692042bcdf 100644 --- a/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/AppendImageGeometryZSlice.d3dpipeline @@ -1,169 +1,212 @@ { "isDisabled": false, - "name": "AppendImageGeometryZSlice.d3dpipeline", - "pinnedParams": [], + "name": "Untitled Pipeline", "pipeline": [ { "args": { - "cell_data_name": "Cell Data", + "array_handling_index": 0, + "cell_attribute_matrix_name": "Cell Data", "dimensions": [ 60, 80, 100 ], - "geometry_data_path": "[Image Geometry]", + "edge_attribute_matrix_name": "Edge Data", + "edge_list_path": "", + "face_attribute_matrix_name": "Face Data", + "geometry_type_index": 0, + "hexahedral_list_path": "", + "length_unit_index": 7, "origin": [ 100.0, 100.0, 0.0 ], + "output_geometry_path": "Image Geometry", + "quadrilateral_list_path": "", "spacing": [ 1.0, 1.0, 1.0 - ] + ], + "tetrahedral_list_path": "", + "triangle_list_path": "", + "vertex_attribute_matrix_name": "Vertex Data", + "vertex_list_path": "", + "warnings_as_errors": false, + "x_bounds_path": "", + "y_bounds_path": "", + "z_bounds_path": "" }, "comments": "", "filter": { - "name": "simplnx::CreateImageGeometryFilter", - "uuid": "c4320659-1a84-461d-939e-c7c10229a504" + "name": "nx::core::CreateGeometryFilter", + "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" }, "isDisabled": false }, { "args": { + "data_format": "", "delimiter_index": 0, "input_file": "Data/ASCIIData/ConfidenceIndex.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ + "number_comp": 1, + "number_tuples": [ [ - 480000 + 0.0 ] ], - "output_array_path": "[Image Geometry]/Cell Data/Confidence Index", - "scalar_type_index": 8 + "output_data_array_path": "Image Geometry/Cell Data/Confidence Index", + "scalar_type_index": 8, + "set_tuple_dimensions": false, + "skip_line_count": 0 }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { + "data_format": "", "delimiter_index": 0, "input_file": "Data/ASCIIData/FeatureIds.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ + "number_comp": 1, + "number_tuples": [ [ - 480000 + 0.0 ] ], - "output_array_path": "[Image Geometry]/Cell Data/FeatureIds", - "scalar_type_index": 4 + "output_data_array_path": "Image Geometry/Cell Data/FeatureIds", + "scalar_type_index": 4, + "set_tuple_dimensions": false, + "skip_line_count": 0 }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { + "data_format": "", "delimiter_index": 0, "input_file": "Data/ASCIIData/ImageQuality.csv", - "number_tuples": 1, - "skip_line_count": 0, - "n_tuples": [ + "number_comp": 1, + "number_tuples": [ [ - 480000 + 0.0 ] ], - "output_array_path": "[Image Geometry]/Cell Data/Image Quality", - "scalar_type_index": 8 + "output_data_array_path": "Image Geometry/Cell Data/Image Quality", + "scalar_type_index": 4, + "set_tuple_dimensions": false, + "skip_line_count": 0 }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { + "data_format": "", "delimiter_index": 0, - "input_file": "Data/ASCIIData/IPFColor.csv", - "number_tuples": 3, - "skip_line_count": 0, - "n_tuples": [ + "input_file": "/Users/mjackson/Applications/NXData/Data/ASCIIData/IPFColor.csv", + "number_comp": 3, + "number_tuples": [ [ - 480000 + 0.0 ] ], - "output_array_path": "[Image Geometry]/Cell Data/IPFColors", - "scalar_type_index": 1 + "output_data_array_path": "Image Geometry/Cell Data/IPFColors", + "scalar_type_index": 1, + "set_tuple_dimensions": false, + "skip_line_count": 0 }, "comments": "", "filter": { - "name": "simplnx::ReadTextDataArrayFilter", + "name": "nx::core::ReadTextDataArrayFilter", "uuid": "25f7df3e-ca3e-4634-adda-732c0e56efd4" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix": "CellFeatureData", - "output_image_geometry_path": "CroppedBottomHalf", - "feature_ids": "", + "cell_feature_attribute_matrix_path": "CellFeatureData", + "feature_ids_path": "", + "input_image_geometry_path": "Image Geometry", + "max_coord": [ + 0.0, + 0.0, + 0.0 + ], "max_voxel": [ 59, 79, 50 ], + "min_coord": [ + 0.0, + 0.0, + 0.0 + ], "min_voxel": [ 0, 0, 0 ], + "output_image_geometry_path": "CroppedBottomHalf", "remove_original_geometry": false, "renumber_features": false, - "input_image_geometry_path": "[Image Geometry]", - "update_origin": false + "use_physical_bounds": false }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false }, { "args": { - "cell_feature_attribute_matrix": "CellFeatureData", - "output_image_geometry_path": "CroppedTopHalf", - "feature_ids": "", + "cell_feature_attribute_matrix_path": "CellFeatureData", + "feature_ids_path": "", + "input_image_geometry_path": "Image Geometry", + "max_coord": [ + 0.0, + 0.0, + 0.0 + ], "max_voxel": [ 59, 79, 99 ], + "min_coord": [ + 0.0, + 0.0, + 0.0 + ], "min_voxel": [ 0, 0, 51 ], + "output_image_geometry_path": "CroppedTopHalf", "remove_original_geometry": false, "renumber_features": false, - "input_image_geometry_path": "[Image Geometry]", - "update_origin": true + "use_physical_bounds": false }, "comments": "", "filter": { - "name": "simplnx::CropImageGeometryFilter", + "name": "nx::core::CropImageGeometryFilter", "uuid": "e6476737-4aa7-48ba-a702-3dfab82c96e2" }, "isDisabled": false @@ -171,14 +214,14 @@ { "args": { "check_resolution": true, - "destination_geometry": "CroppedBottomHalf", - "input_triangle_geometry_path": "CroppedTopHalf", - "new_geometry": "AppendedImageGeom", + "destination_image_geometry_path": "CroppedTopHalf", + "input_image_geometry_path": "CroppedBottomHalf", + "output_image_geometry_path": "Appended Image Geometry", "save_as_new_geometry": true }, "comments": "", "filter": { - "name": "simplnx::AppendImageGeometryZSliceFilter", + "name": "nx::core::AppendImageGeometryZSliceFilter", "uuid": "c62c5c89-5ea8-4948-99ca-51cbc5b54b05" }, "isDisabled": false @@ -190,11 +233,11 @@ }, "comments": "", "filter": { - "name": "simplnx::WriteDREAM3DFilter", + "name": "nx::core::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false } ], - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline index 6a8282be1c..0df9fc92ba 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Demo.d3dpipeline @@ -1,30 +1,7 @@ { "isDisabled": false, - "name": "ApplyTransformation_Demo.d3dpipeline", - "pinnedParams": [], + "name": "Apply Transformation To Geometry Demo", "pipeline": [ - { - "args": { - "data_object_path": "Group 1" - }, - "comments": "", - "filter": { - "name": "simplnx::CreateDataGroupFilter", - "uuid": "e7d2f9b8-4131-4b28-a843-ea3c6950f101" - }, - "isDisabled": false - }, - { - "args": { - "data_object_path": "Group 1/Group 2" - }, - "comments": "", - "filter": { - "name": "simplnx::CreateDataGroupFilter", - "uuid": "e7d2f9b8-4131-4b28-a843-ea3c6950f101" - }, - "isDisabled": false - }, { "args": { "array_handling_index": 0, @@ -35,34 +12,35 @@ 2 ], "edge_attribute_matrix_name": "Edge Data", - "edge_list_name": "", + "edge_list_path": "", "face_attribute_matrix_name": "Face Data", - "geometry_name": "Group 1/Group 2/[Geometry]", - "geometry_type": 0, - "hexahedral_list_name": "", + "geometry_type_index": 0, + "hexahedral_list_path": "", + "length_unit_index": 7, "origin": [ 0.0, 0.0, 0.0 ], - "quadrilateral_list_name": "", + "output_geometry_path": "Geometry", + "quadrilateral_list_path": "", "spacing": [ 1.0, 1.0, 1.0 ], - "tetrahedral_list_name": "", - "triangle_list_name": "", + "tetrahedral_list_path": "", + "triangle_list_path": "", "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_name": "", + "vertex_list_path": "", "warnings_as_errors": false, - "x_bounds": "", - "y_bounds": "", - "z_bounds": "" + "x_bounds_path": "", + "y_bounds_path": "", + "z_bounds_path": "" }, "comments": "", "filter": { - "name": "simplnx::CreateGeometryFilter", + "name": "nx::core::CreateGeometryFilter", "uuid": "24768170-5b90-4a9d-82ac-9aeecd9f892e" }, "isDisabled": false @@ -70,9 +48,11 @@ { "args": { "component_count": 1, + "data_format": "", "initialization_value_str": "2", - "numeric_type": 4, - "output_array_path": "Group 1/Group 2/[Geometry]/Cell Data/Data", + "numeric_type_index": 4, + "output_array_path": "Geometry/Cell Data/Data", + "set_tuple_dimensions": false, "tuple_dimensions": [ [ 2.0, @@ -83,16 +63,17 @@ }, "comments": "", "filter": { - "name": "simplnx::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false }, { "args": { - "cell_attribute_matrix_path": "Group 1/Group 2/[Geometry]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 1, + "cell_attribute_matrix_path": "Geometry/Cell Data", + "computed_transformation_matrix_path": "", + "input_image_geometry_path": "Geometry", + "interpolation_type_index": 0, "manual_transformation_matrix": [ [ 1.0, @@ -130,8 +111,8 @@ 2.0, 2.0 ], - "input_image_geometry_path": "Group 1/Group 2/[Geometry]", - "transformation_type": 5, + "transformation_type_index": 3, + "translate_geometry_to_global_origin": false, "translation": [ 0.0, 0.0, @@ -140,11 +121,11 @@ }, "comments": "", "filter": { - "name": "simplnx::ApplyTransformationToGeometryFilter", + "name": "nx::core::ApplyTransformationToGeometryFilter", "uuid": "f5bbc16b-3426-4ae0-b27b-ba7862dc40fe" }, "isDisabled": false } ], - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline index 32fbde4323..22bc8c9900 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Image.d3dpipeline @@ -34,8 +34,8 @@ { "args": { "cell_attribute_matrix_path": "Transform [Rotate]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 1, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 1, "manual_transformation_matrix": [ [ 1.0, @@ -74,7 +74,7 @@ 1.0 ], "input_image_geometry_path": "Transform [Rotate]", - "transformation_type": 3, + "transformation_type_index": 3, "translation": [ 10.0, 10.0, @@ -105,8 +105,8 @@ { "args": { "cell_attribute_matrix_path": "Transform [Scale]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 1, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 1, "manual_transformation_matrix": [ [ 1.0, @@ -145,7 +145,7 @@ 1.0 ], "input_image_geometry_path": "Transform [Scale]", - "transformation_type": 5, + "transformation_type_index": 5, "translation": [ 10.0, 10.0, @@ -176,8 +176,8 @@ { "args": { "cell_attribute_matrix_path": "Transform [Translate]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 1, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 1, "manual_transformation_matrix": [ [ 1.0, @@ -216,7 +216,7 @@ 1.0 ], "input_image_geometry_path": "Transform [Translate]", - "transformation_type": 4, + "transformation_type_index": 4, "translation": [ 50.0, 0.0, @@ -247,8 +247,8 @@ { "args": { "cell_attribute_matrix_path": "Transform [Rotation-Interpolation]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 2, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 1, "manual_transformation_matrix": [ [ 222.0, @@ -287,7 +287,7 @@ 1.0 ], "input_image_geometry_path": "Transform [Rotation-Interpolation]", - "transformation_type": 3, + "transformation_type_index": 3, "translation": [ 10.0, 10.0, @@ -318,8 +318,8 @@ { "args": { "cell_attribute_matrix_path": "Transform [Scale-Interpolation]/Cell Data", - "computed_transformation_matrix": "", - "interpolation_type": 2, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 1, "manual_transformation_matrix": [ [ 222.0, @@ -358,7 +358,7 @@ 1.0 ], "input_image_geometry_path": "Transform [Scale-Interpolation]", - "transformation_type": 5, + "transformation_type_index": 5, "translation": [ 10.0, 10.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline index 7fdedfa9b8..95d258a111 100644 --- a/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ApplyTransformation_Node.d3dpipeline @@ -34,8 +34,8 @@ { "args": { "cell_attribute_matrix_path": "", - "computed_transformation_matrix": "", - "interpolation_type": 0, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 2, "manual_transformation_matrix": [ [ 1.0, @@ -74,7 +74,7 @@ 1.0 ], "input_image_geometry_path": "Blade [Rotation]", - "transformation_type": 3, + "transformation_type_index": 3, "translation": [ 0.0, 0.0, @@ -105,8 +105,8 @@ { "args": { "cell_attribute_matrix_path": "", - "computed_transformation_matrix": "", - "interpolation_type": 0, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 2, "manual_transformation_matrix": [ [ 1.0, @@ -145,7 +145,7 @@ 1.0 ], "input_image_geometry_path": "Blade [Translation]", - "transformation_type": 4, + "transformation_type_index": 4, "translation": [ 10.0, 10.0, @@ -176,8 +176,8 @@ { "args": { "cell_attribute_matrix_path": "", - "computed_transformation_matrix": "", - "interpolation_type": 0, + "computed_transformation_matrix_path": "", + "interpolation_type_index": 2, "manual_transformation_matrix": [ [ 1.0, @@ -216,7 +216,7 @@ 1.0 ], "input_image_geometry_path": "Blade [Scale]", - "transformation_type": 5, + "transformation_type_index": 5, "translation": [ 10.0, 10.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline index 155d6a69f4..51e5b64ebc 100644 --- a/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -6,7 +6,7 @@ "args": { "component_count": 1, "initialization_value_str": "2", - "numeric_type": 4, + "numeric_type_index": 4, "output_array_path": "TestArray", "tuple_dimensions": [ [ @@ -25,7 +25,7 @@ "args": { "component_count": 1, "initialization_value_str": "1.23878", - "numeric_type": 8, + "numeric_type_index": 8, "output_array_path": "Confidence Index", "tuple_dimensions": [ [ @@ -44,7 +44,7 @@ "args": { "component_count": 3, "initialization_value_str": "1.23878", - "numeric_type": 8, + "numeric_type_index": 8, "output_array_path": "EulerAngles", "tuple_dimensions": [ [ diff --git a/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline index fb0bdb91af..c9b93b5cb4 100644 --- a/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/CombineStlFiles.d3dpipeline @@ -8,7 +8,7 @@ "face_attribute_matrix_name": "Face Data", "face_normals_array_name": "FaceNormals", "stl_files_path": "Data/STL_Models", - "triangle_data_container_name": "TriangleGeometry", + "output_triangle_geometry_path": "TriangleGeometry", "vertex_attribute_matrix_name": "Vertex Data" }, "comments": "", diff --git a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline index 85f6c437ae..4ff48ebf1d 100644 --- a/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ExtractVertexGeometry.d3dpipeline @@ -61,7 +61,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", @@ -169,7 +169,7 @@ "DataContainer/Cell Data/Y Position", "DataContainer/Cell Data/Mask" ], - "input_image_geometry_path": "DataContainer", + "input_grid_geometry_path": "DataContainer", "mask_array_path": "DataContainer/Cell Data/Mask Y Pos", "output_shared_vertex_list_name": "SharedVertexList", "output_vertex_attr_matrix_name": "VertexData", diff --git a/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline index 004346ec66..173867bd4e 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindBiasedFeatures.d3dpipeline @@ -95,7 +95,7 @@ "feature_ids_path": "DataContainer/CellData/FeatureIds", "mark_feature_0_neighbors": true, "feature_attribute_matrix_path": "DataContainer/CellFeatureData", - "surface_features_array_path": "SurfaceFeatures" + "surface_features_array_name": "SurfaceFeatures" }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline index 590199bc45..83677b2074 100644 --- a/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -88,10 +88,10 @@ "cell_phases_array_path": "DataContainer/CellData/Phases", "crystal_structures_array_path": "DataContainer/CellEnsembleData/CrystalStructures", "feature_ids_array_name": "FeatureIds", - "mask_array_path": "DataContainer/CellData/Mask", + "cell_mask_array_path": "DataContainer/CellData/Mask", "input_image_geometry_path": "DataContainer", "misorientation_tolerance": 5.0, - "quats_array_path": "DataContainer/CellData/Quats", + "cell_quats_array_path": "DataContainer/CellData/Quats", "randomize_features": true, "use_mask": true }, @@ -107,8 +107,8 @@ "cell_feature_attribute_matrix_path": "DataContainer/CellFeatureData", "feature_ids_array_path": "DataContainer/CellData/FeatureIds", "input_image_geometry_path": "DataContainer", - "largest_cross_sections_array_path": "LargestCrossSections", - "plane": 0 + "largest_cross_sections_array_name": "LargestCrossSections", + "plane_index": 0 }, "comments": "", "filter": { diff --git a/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow index cfea24e1b9..a4070fdb73 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow +++ b/src/Plugins/SimplnxCore/pipelines/Import_ASCII_Data.d3dworkflow @@ -11,7 +11,7 @@ 100, 100 ], - "geometry_data_path": "[Image Geometry]", + "output_image_geometry_path": "[Image Geometry]", "origin": [ 0.0, 0.0, @@ -59,7 +59,7 @@ "filterIndex": 0, "filterUuid": "c4320659-1a84-461d-939e-c7c10229a504", "paramUuid": "bff2d4ac-04a6-5251-b188-4f83f7865074", - "paramName": "geometry_data_path" + "paramName": "output_image_geometry_path" }, { "filterIndex": 1, diff --git a/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline similarity index 74% rename from src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline index 16d3cfef2d..29836dcfd4 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_ASCII.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_CSV_File.d3dpipeline @@ -1,8 +1,19 @@ { "isDisabled": false, - "name": "Import_ASCII.d3dpipeline", - "pinnedParams": [], + "name": "Import CSV File", "pipeline": [ + { + "args": { + "export_file_path": "Data/Output/Import_ASCII_IPF.dream3d", + "write_xdmf_file": true + }, + "comments": "", + "filter": { + "name": "nx::core::WriteDREAM3DFilter", + "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" + }, + "isDisabled": false + }, { "args": { "cell_data_name": "CellData", @@ -11,12 +22,12 @@ 40, 100 ], - "geometry_data_path": "[Image Geometry]", "origin": [ 0.0, 0.0, 0.0 ], + "output_image_geometry_path": "[Image Geometry]", "spacing": [ 0.25, 0.25, @@ -25,15 +36,15 @@ }, "comments": "", "filter": { - "name": "simplnx::CreateImageGeometryFilter", + "name": "nx::core::CreateImageGeometryFilter", "uuid": "c4320659-1a84-461d-939e-c7c10229a504" }, "isDisabled": false }, { "args": { - "created_data_group": "", - "read_csv_data": { + "created_data_group_path": "Imported Data", + "read_csv_data_object": { "Consecutive Delimiters": false, "Custom Headers": [ "phi1", @@ -50,7 +61,7 @@ ], "Header Line": 1, "Header Mode": 1, - "Input File Path": "C:/Users/alejo/Downloads/DREAM3DNX-7.0.0-RC-7-UDRI-20231027.2-windows-AMD64/DREAM3DNX-7.0.0-RC-7-UDRI-20231027.2-windows-AMD64/Data/ASCIIData/EulersRotated.csv", + "Input File Path": "Data/ASCIIData/EulersRotated.csv", "Skipped Array Mask": [ false, false, @@ -58,40 +69,40 @@ ], "Start Import Row": 1, "Tuple Dimensions": [ - 480001 + 480000 ] }, - "selected_data_group": "[Image Geometry]/CellData", + "selected_attribute_matrix_path": "[Image Geometry]/CellData", "use_existing_group": true }, "comments": "", "filter": { - "name": "simplnx::ReadCSVFileFilter", + "name": "nx::core::ReadCSVFileFilter", "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261" }, "isDisabled": false }, { "args": { - "move_values": true, - "normalize_data": false, "input_data_array_paths": [ "[Image Geometry]/CellData/phi1", "[Image Geometry]/CellData/Phi", "[Image Geometry]/CellData/phi2" ], + "move_values": true, + "normalize_data": false, "output_data_array_name": "Eulers" }, "comments": "", "filter": { - "name": "simplnx::CombineAttributeArraysFilter", + "name": "nx::core::CombineAttributeArraysFilter", "uuid": "2436b614-e96d-47f0-9f6f-41d6fe97acd4" }, "isDisabled": false }, { "args": { - "cell_ensemble_attribute_matrix_name": "[Image Geometry]/CellEnsembleData", + "cell_ensemble_attribute_matrix_path": "[Image Geometry]/EnsembleAttributeMatrix", "crystal_structures_array_name": "CrystalStructures", "ensemble": [ [ @@ -105,19 +116,19 @@ }, "comments": "", "filter": { - "name": "simplnx::CreateEnsembleInfoFilter", + "name": "nx::core::CreateEnsembleInfoFilter", "uuid": "8ce3d70c-49fe-4812-a1eb-7ce4c962a59d" }, "isDisabled": false }, { "args": { - "set_tuple_dimensions": true, "component_count": 1, "data_format": "", "initialization_value_str": "1", - "numeric_type": 4, + "numeric_type_index": 4, "output_array_path": "[Image Geometry]/CellData/Phases", + "set_tuple_dimensions": true, "tuple_dimensions": [ [ 0.0 @@ -126,7 +137,7 @@ }, "comments": "", "filter": { - "name": "complex::CreateDataArrayFilter", + "name": "nx::core::CreateDataArrayFilter", "uuid": "67041f9b-bdc6-4122-acc6-c9fe9280e90d" }, "isDisabled": false @@ -136,7 +147,7 @@ "cell_euler_angles_array_path": "[Image Geometry]/CellData/Eulers", "cell_ipf_colors_array_name": "IPFColors", "cell_phases_array_path": "[Image Geometry]/CellData/Phases", - "crystal_structures_array_path": "[Image Geometry]/CellEnsembleData/CrystalStructures", + "crystal_structures_array_path": "[Image Geometry]/EnsembleAttributeMatrix/CrystalStructures", "mask_array_path": "", "reference_dir": [ 0.0, @@ -147,7 +158,7 @@ }, "comments": "", "filter": { - "name": "simplnx::GenerateIPFColorsFilter", + "name": "nx::core::GenerateIPFColorsFilter", "uuid": "64cb4f27-6e5e-4dd2-8a03-0c448cb8f5e6" }, "isDisabled": false @@ -156,30 +167,17 @@ "args": { "file_name": "Data/Output/Import_ASCII_IPF.png", "image_array_path": "[Image Geometry]/CellData/IPFColors", - "input_image_geometry_path": "[Image Geometry]", "index_offset": 0, - "plane": 0 + "input_image_geometry_path": "[Image Geometry]", + "plane_index": 0 }, "comments": "", "filter": { - "name": "simplnx::ITKImageWriter", + "name": "nx::core::ITKImageWriterFilter", "uuid": "a181ee3e-1678-4133-b9c5-a9dd7bfec62f" }, "isDisabled": false - }, - { - "args": { - "export_file_path": "Data/Output/Small_IN100/EnsembleData.dream3d", - "write_xdmf_file": true - }, - "comments": "", - "filter": { - "name": "simplnx::WriteDREAM3DFilter", - "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" - }, - "isDisabled": true } ], - "version": 1, - "workflowParams": [] -} + "version": 1 +} \ No newline at end of file diff --git a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline index c5f1ee28e8..6345c1ceba 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_STL_Model.d3dpipeline @@ -33,7 +33,7 @@ "args": { "component_count": 1, "initialization_value_str": "0", - "numeric_type": 8, + "numeric_type_index": 8, "output_array_path": "[Triangle Geometry]/Vertex Data/Node Type", "tuple_dimensions": [ [ diff --git a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline similarity index 97% rename from src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline rename to src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline index f108cd7175..e9aa5be6d6 100644 --- a/src/Plugins/SimplnxCore/pipelines/Import_CSV_Data.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/Import_Text_Data.d3dpipeline @@ -1,6 +1,6 @@ { "isDisabled": false, - "name": "Import_CSV_Data.d3dpipeline", + "name": "Import Text Data Files", "pinnedParams": [], "pipeline": [ { @@ -11,7 +11,7 @@ 80, 100 ], - "geometry_data_path": "[Image Geometry]", + "output_image_geometry_path": "[Image Geometry]", "origin": [ 100.0, 100.0, diff --git a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index 32bf62c302..09a9e180bd 100644 --- a/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -92,7 +92,7 @@ 0.0 ] ], - "rotation_representation": 0, + "rotation_representation_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", @@ -123,7 +123,7 @@ "args": { "change_origin": true, "change_spacing": true, - "image_geom": "DataContainer", + "input_image_geometry_path": "DataContainer", "origin": [ 0.0, 0.0, @@ -144,9 +144,9 @@ }, { "args": { - "cell_feature_attribute_matrix": "CellFeatureData", + "cell_feature_attribute_matrix_path": "CellFeatureData", "output_image_geometry_path": "", - "feature_ids": "", + "feature_ids_path": "", "max_voxel": [ 160, 175, @@ -160,7 +160,7 @@ "remove_original_geometry": true, "renumber_features": false, "input_image_geometry_path": "DataContainer", - "update_origin": false + "use_physical_bounds": false }, "comments": "", "filter": { @@ -195,7 +195,7 @@ "comparison_data_path": "DataContainer/Cell Data/Confidence Index", "loop": true, "min_confidence": 0.10000000149011612, - "selected_comparison": 0, + "comparison_index": 0, "input_image_geometry_path": "DataContainer" }, "comments": "", diff --git a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline index 09ec985e5a..f43119ce12 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResamplePorosityImage.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "Cell Data", "image_data_array_name": "ImageData", "output_image_geometry_path": "Porosity_Image", - "image_transform_choice": 0, + "image_transform_index": 0, "input_file_list_object": { "end_index": 174, "file_extension": ".tif", @@ -50,7 +50,7 @@ "new_data_container_path": "Porosity_Image_Resampled_Spacing", "remove_original_geometry": false, "renumber_features": false, - "resampling_mode": 0, + "resampling_mode_index": 0, "scaling": [ 120.4000015258789, 50.7400016784668, @@ -82,7 +82,7 @@ "new_data_container_path": "Porosity_Image_Resampled_Scaled", "remove_original_geometry": false, "renumber_features": false, - "resampling_mode": 1, + "resampling_mode_index": 1, "scaling": [ 50.0, 50.0, @@ -114,7 +114,7 @@ "new_data_container_path": "Porosity_Image_Resampled_Exact_Dims", "remove_original_geometry": false, "renumber_features": false, - "resampling_mode": 2, + "resampling_mode_index": 2, "scaling": [ 120.4000015258789, 50.7400016784668, diff --git a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index 95141560d0..a7ed7f1825 100644 --- a/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -5,8 +5,8 @@ "pipeline": [ { "args": { - "created_data_group": "Bounds", - "read_csv_data": { + "created_data_group_path": "Bounds", + "read_csv_data_object": { "Consecutive Delimiters": false, "Custom Headers": null, "Data Types": [ @@ -30,7 +30,7 @@ 14 ] }, - "selected_data_group": "", + "created_data_group_path": "", "use_existing_group": false }, "comments": "", @@ -50,31 +50,31 @@ 200 ], "edge_attribute_matrix_name": "Edge Data", - "edge_list_name": "", + "edge_list_path": "", "face_attribute_matrix_name": "Face Data", - "geometry_name": "RectGridGeometry", - "geometry_type": 1, - "hexahedral_list_name": "", + "geometry_type_index": "RectGridGeometry", + "geometry_type_index": 1, + "hexahedral_list_path": "", "length_unit_index": 7, "origin": [ 0.0, 0.0, 0.0 ], - "quadrilateral_list_name": "", + "quadrilateral_list_path": "", "spacing": [ 1.0, 1.0, 1.0 ], - "tetrahedral_list_name": "", - "triangle_list_name": "", + "tetrahedral_list_path": "", + "triangle_list_path": "", "vertex_attribute_matrix_name": "Vertex Data", - "vertex_list_name": "", + "vertex_list_path": "", "warnings_as_errors": false, - "x_bounds": "Bounds/x", - "y_bounds": "Bounds/y", - "z_bounds": "Bounds/z" + "x_bounds_path": "Bounds/x", + "y_bounds_path": "Bounds/y", + "z_bounds_path": "Bounds/z" }, "comments": "", "filter": { @@ -228,7 +228,7 @@ 20, 20 ], - "image_geom_cell_attribute_matrix": "CellData", + "image_geom_cell_attribute_matrix_name": "CellData", "input_image_geometry_path": "Image Geometry", "rectilinear_grid_path": "RectGridGeometry", "input_data_array_paths": [ diff --git a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline index 55e0b54b6f..51cc5aa4df 100644 --- a/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline +++ b/src/Plugins/SimplnxCore/pipelines/SurfaceNets_Demo.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "Optical Data", "image_data_array_name": "ImageData", "output_image_geometry_path": "RoboMet.3D Image Stack", - "image_transform_choice": 0, + "image_transform_index": 0, "input_file_list_object": { "end_index": 174, "file_extension": ".tif", @@ -73,7 +73,7 @@ "args": { "active_array_name": "Active", "cell_feature_group_name": "Pore Data", - "feature_ids_path": "FeatureIds", + "feature_ids_name": "FeatureIds", "input_image_geometry_path": "RoboMet.3D Image Stack", "input_array_path": "RoboMet.3D Image Stack/Optical Data/ImageData", "mask_path": "RoboMet.3D Image Stack/Optical Data/Mask", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp index 6d9024e22a..99a292884f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AddBadDataFilter.cpp @@ -56,21 +56,22 @@ Parameters AddBadDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "AddBadData SeedValue")); - params.insertSeparator(Parameters::Separator{"Optional Variables"}); + params.insertSeparator(Parameters::Separator{"Optional Parameters"}); params.insertLinkableParameter(std::make_unique(k_PoissonNoise_Key, "Add Random Noise", "If true the user may set the poisson volume fraction", false)); params.insert(std::make_unique(k_PoissonVolFraction_Key, "Volume Fraction of Random Noise", "A value between 0 and 1 inclusive that is compared against random generation", 0.0f)); params.insertLinkableParameter(std::make_unique(k_BoundaryNoise_Key, "Add Boundary Noise", "If true the user may set the boundary volume fraction", false)); params.insert( std::make_unique(k_BoundaryVolFraction_Key, "Volume Fraction of Boundary Noise", "A value between 0 and 1 inclusive that is compared against random generation", 0.0f)); - params.insertSeparator(Parameters::Separator{"Required Objects"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The selected image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GBEuclideanDistancesArrayPath_Key, "Boundary Euclidean Distances", "This is the GB Manhattan Distances array", DataPath{}, std::set{DataType::int32})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp index 254e05c81e..05e87b32b2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/RemoveFlaggedFeatures.cpp @@ -429,7 +429,7 @@ Result<> RemoveFlaggedFeatures::operator()() m_MessageHandler(IFilter::ProgressMessage{IFilter::Message::Type::Info, fmt::format("Stripping excess inactive objects from model...")}); DataPath featureGroupPath = m_InputValues->FlaggedFeaturesArrayPath.getParent(); - if(!RemoveInactiveObjects(m_DataStructure, featureGroupPath, activeObjects, featureIds, flaggedFeatures->getNumberOfTuples(), m_MessageHandler)) + if(!RemoveInactiveObjects(m_DataStructure, featureGroupPath, activeObjects, featureIds, flaggedFeatures->getNumberOfTuples(), m_MessageHandler, m_ShouldCancel)) { return MakeErrorResult(-45434, "The removal has failed!"); } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp index 7bed477e93..e3b963e949 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignGeometriesFilter.cpp @@ -408,7 +408,7 @@ Parameters AlignGeometriesFilter::parameters() const Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MovingGeometry_Key, "Moving Geometry", "The geometry that will be moved.", DataPath(), geomTypes)); params.insert(std::make_unique(k_TargetGeometry_Key, "Fixed Geometry", "The geometry that does *not* move.", DataPath(), geomTypes)); params.insert(std::make_unique(k_AlignmentType_Key, "Alignment Type", "The type of alignment to perform (Origin or Centroid.", 0, std::vector{"Origin", "Centroid"})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp index cd09996011..a651e83992 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.cpp @@ -67,16 +67,17 @@ Parameters AlignSectionsFeatureCentroidFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_UseReferenceSlice_Key, "Use Reference Slice", "Whether the centroids of each section should be compared to a reference slice instead of their neighboring section", false)); params.insert(std::make_unique(k_ReferenceSlice_Key, "Reference Slice", "Slice number to use as reference", 0)); params.linkParameters(k_UseReferenceSlice_Key, k_ReferenceSlice_Key, true); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedCellDataGroup_Key, "Cell Data Attribute Matrix", "Cell Data Attribute Matrix", DataPath{})); + params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the DataArray Mask", DataPath({"Mask"}), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp index 71a14f0ee9..bd14aa19fe 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AlignSectionsListFilter.cpp @@ -54,12 +54,12 @@ Parameters AlignSectionsListFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input .txt file path containing the shifts to apply to the sections", fs::path("DefaultInputFileName"), FileSystemPathParameter::ExtensionsType{"txt"}, FileSystemPathParameter::PathType::InputFile)); params.insert( std::make_unique(k_DREAM3DAlignmentFile_Key, "DREAM3D Alignment File Format", "Turn this ON if the alignment file was generated by another DREAM.3D Alignment filter", false)); - params.insertSeparator(Parameters::Separator{"Required Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the alignment", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp index 0abcb98d09..589beab460 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/AppendImageGeometryZSliceFilter.cpp @@ -60,7 +60,7 @@ Parameters AppendImageGeometryZSliceFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputGeometry_Key, "Input Image Geometry", "The incoming image geometry (cell data) that is to be appended.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_DestinationGeometry_Key, "Destination Image Geometry", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp index ce02bc6b82..993fa195b1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApplyTransformationToGeometryFilter.cpp @@ -78,7 +78,7 @@ Parameters ApplyTransformationToGeometryFilter::parameters() const // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_TransformationType_Key, "Transformation Type", "The type of transformation to perform.", k_RotationIdx, k_TransformationChoices)); @@ -102,7 +102,7 @@ Parameters ApplyTransformationToGeometryFilter::parameters() const "Specifies whether to translate the geometry to (0, 0, 0), apply the transformation, and then translate the geometry back to its original origin.", false)); - params.insertSeparator({"Input Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Geometry"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Geometry", "The target geometry on which to perform the transformation", DataPath{}, IGeometry::GetAllGeomTypes())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp index 9195ca0ef5..a7b7fcdd51 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ApproximatePointCloudHullFilter.cpp @@ -61,14 +61,14 @@ Parameters ApproximatePointCloudHullFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_GridResolution_Key, "Grid Resolution", "Geometry resolution", std::vector{0, 0, 0}, std::vector{"X", "Y", "Z"})); params.insert(std::make_unique(k_MinEmptyNeighbors_Key, "Minimum Number of Empty Neighbors", "Minimum number of empty neighbors", 0)); - params.insertSeparator(Parameters::Separator{"Required Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Vertex Geometry"}); params.insert(std::make_unique(k_VertexGeomPath_Key, "Vertex Geometry", "Path to the target Vertex geometry", DataPath())); - params.insertSeparator(Parameters::Separator{"Created Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Geometry"}); params.insert(std::make_unique(k_HullVertexGeomPath_Key, "Hull Vertex Geometry", "Path to create the hull Vertex geometry", DataPath{})); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp index 4904fd439f..c94f9f7bb5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ArrayCalculatorFilter.cpp @@ -53,10 +53,10 @@ Parameters ArrayCalculatorFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); 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.insertSeparator(Parameters::Separator{"Output 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/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp index 3b1a592d92..7d63197603 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateArrayHistogramFilter.cpp @@ -52,17 +52,17 @@ Parameters CalculateArrayHistogramFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_NumberOfBins_Key, "Number of Bins", "Specifies number of histogram bins (greater than zero)", 1)); params.insertLinkableParameter( std::make_unique(k_UserDefinedRange_Key, "Use Custom Min & Max Range", "Whether the user can set the min and max values to consider for the histogram", false)); params.insert(std::make_unique(k_MinRange_Key, "Min Value", "Specifies the lower bound of the histogram.", 0.0)); params.insert(std::make_unique(k_MaxRange_Key, "Max Value", "Specifies the upper bound of the histogram.", 1.0)); - params.insertSeparator(Parameters::Separator{"Input Arrays"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_SelectedArrayPaths_Key, "Input Data Arrays", "The list of arrays to calculate histogram(s) for", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllNumericTypes())); - params.insertSeparator(Parameters::Separator{"Output Set Up"}); + params.insertSeparator(Parameters::Separator{"Output parameters"}); params.insertLinkableParameter( std::make_unique(k_CreateNewDataGroup_Key, "Create New DataGroup for Histograms", "Whether or not to store the calculated histogram(s) in a new DataGroup", true)); params.insert(std::make_unique(k_NewDataGroupPath_Key, "New DataGroup Path", "The path to the new DataGroup in which to store the calculated histogram(s)", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp index 2ada87fba6..f399a5129a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateFeatureSizesFilter.cpp @@ -55,20 +55,21 @@ Parameters CalculateFeatureSizesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SaveElementSizes_Key, "Generate Missing Element Sizes", "If checked this will generate and store the element sizes ONLY if the geometry does not already contain them.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GeometryPath_Key, "Input Image Geometry", "DataPath to input Image Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "Feature Attribute Matrix of the selected Feature Ids", DataPath({"CellFeatureData"}))); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_EquivalentDiametersName_Key, "Equivalent Diameters", "DataPath to equivalent diameters array", "EquivalentDiameters")); params.insert(std::make_unique(k_NumElementsName_Key, "Number of Elements", "DataPath to Num Elements array", "NumElements")); params.insert(std::make_unique(k_VolumesName_Key, "Volumes", "DataPath to volumes array", "Volumes")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp index f5a95d97ef..6a19bbcbd8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CalculateTriangleAreasFilter.cpp @@ -105,10 +105,10 @@ Parameters CalculateTriangleAreasFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriangleGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the face areas", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_CalculatedAreasDataName_Key, "Created Face Areas", "The complete path to the array storing the calculated face areas", "Face Areas")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp index 46f73dab70..485e7f557a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ChangeAngleRepresentationFilter.cpp @@ -90,7 +90,7 @@ Parameters ChangeAngleRepresentationFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ConversionType_Key, "Conversion Type", "Tells the Filter which conversion is being made", 0, ChoicesParameter::Choices{"Degrees to Radians", "Radians to Degrees"})); params.insert(std::make_unique(k_AnglesArrayPath_Key, "Angles", "The DataArray containing the angles to be converted.", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp index dbb06172c2..ba950d298c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineAttributeArraysFilter.cpp @@ -56,17 +56,17 @@ Parameters CombineAttributeArraysFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_NormalizeData_Key, "Normalize Data", "Whether to normalize the combine data on the interval [0, 1]", false)); params.insert(std::make_unique(k_MoveValues_Key, "Move Data", "Whether to remove the original arrays after combining the data", false)); - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Attribute Arrays to Combine", "The complete path to each of the Attribute Arrays to combine", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, MultiArraySelectionParameter::AllowedDataTypes{})); - params.insertSeparator(Parameters::Separator{"Created Output Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_StackedDataArrayName_Key, "Created Data Array", "This is the name of the created output array of the combined attribute arrays.", "Combined DataArray")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp index 7a7afafdb4..5f418e7e57 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CombineStlFilesFilter.cpp @@ -57,7 +57,7 @@ Parameters CombineStlFilesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_StlFilesPath_Key, "Path to STL Files", "The path to the folder containing all the STL files to be combined", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputDir)); @@ -69,15 +69,15 @@ Parameters CombineStlFilesFilter::parameters() const params.insert(std::make_unique(k_VertexLabelName_Key, "Created Vertex Labels", "The name of the vertex labels data array", "FileIndex")); params.linkParameters(k_LabelVertices_Key, k_VertexLabelName_Key, true); - params.insertSeparator(Parameters::Separator{"Created Data"}); + params.insertSeparator(Parameters::Separator{"Output Geometry"}); params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The path to the triangle geometry to be created from the combined STL files", DataPath({"TriangleGeometry"}))); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_FaceAttributeMatrixName_Key, "Face Attribute Matrix", "The name of the face level attribute matrix to be created with the geometry", TriangleGeom::k_FaceDataName)); params.insert(std::make_unique(k_FaceNormalsArrayName_Key, "Face Normals", "The name of the data array in which to store the face normals for the created triangle geometry", "FaceNormals")); - params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Data"}); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Attribute Matrix", "The name of the vertex level attribute matrix to be created with the geometry", TriangleGeom::k_VertexDataName)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp index b58ad7f135..a54b58cc62 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeFeatureRectFilter.cpp @@ -50,13 +50,13 @@ Parameters ComputeFeatureRectFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{{"FeatureIds"}}, + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{{"FeatureIds"}}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_FeatureDataAttributeMatrixPath_Key, "Feature Data Attribute Matrix", "The path to the feature data attribute matrix associated with the input feature ids array", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_FeatureRectArrayName_Key, "Feature Rect", "The feature rect calculated from the feature ids", "FeatureRect")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp index e260e78f98..765dc6a1cf 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ComputeMomentInvariants2DFilter.cpp @@ -54,16 +54,16 @@ Parameters ComputeMomentInvariants2DFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "2D Image Geometry", "The path to the 2D image geometry to be used as input", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_FeatureRectArrayPath_Key, "Feature Rect", "Array holding the min xy and max xy pixel coordinates of each feature id", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint32}, ArraySelectionParameter::AllowedComponentShapes{{6}})); params.insert(std::make_unique(k_NormalizeMomentInvariants_Key, "Normalize Moment Invariants", "Should the algorithm normalize the results to unit circle.", true)); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix where the created data arrays will be stored", DataPath{})); params.insert(std::make_unique(k_Omega1ArrayName_Key, "Omega 1", "Omega1 value", "Omega1")); params.insert(std::make_unique(k_Omega2ArrayName_Key, "Omega 2", "Omega2 value", "Omega2")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp index ea45f43fdf..641fd5c7ec 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConditionalSetValueFilter.cpp @@ -89,7 +89,7 @@ Parameters ConditionalSetValueFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ReplaceValue_Key, "New Value", "The value that will be used as the replacement value", "0")); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); @@ -100,7 +100,7 @@ Parameters ConditionalSetValueFilter::parameters() const ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8, DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_RemoveValue_Key, "Value To Replace", "The numerical value that will be replaced in the array", "0")); - params.insertSeparator(Parameters::Separator{"Required Input Data"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert( std::make_unique(k_SelectedArrayPath_Key, "Attribute Array", "The complete path to array that will have values replaced", DataPath{}, nx::core::GetAllDataTypes())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp index bcde00e9c9..312d0a4d95 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertColorToGrayScaleFilter.cpp @@ -55,7 +55,7 @@ Parameters ConvertColorToGrayScaleFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); // Create the parameter descriptors that are needed for this filter params.insertLinkableParameter(std::make_unique(k_ConversionAlgorithm_Key, "Conversion Algorithm", "Which method to use when flattening the RGB array", 0, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp index 12d211c74b..8b002074a9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ConvertDataFilter.cpp @@ -54,12 +54,12 @@ Parameters ConvertDataFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ScalarType_Key, "Scalar Type", "Convert to this data type", 0, GetAllDataTypesAsStrings())); params.insert(std::make_unique(k_ArrayToConvertPath_Key, "Data Array to Convert", "The complete path to the Data Array to Convert", DataPath{}, GetAllDataTypes())); params.insert(std::make_unique(k_DeleteOriginal_Key, "Remove Original Array", "Whether or not to remove the original array after conversion", false)); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_ConvertedArrayName_Key, "Converted Data Array", "The name of the converted Data Array", "Converted_")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp index 73de454fff..a8e2f1e02b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyDataObjectFilter.cpp @@ -51,7 +51,7 @@ Parameters CopyDataObjectFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_DataPath_Key, "Objects to copy", "A list of DataPaths to the DataObjects to be copied", MultiPathSelectionParameter::ValueType{})); params.insertLinkableParameter(std::make_unique(k_UseNewParent_Key, "Copy to New Parent", "Copy all the DataObjects to a new BaseGroup", false)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp index a03a7e1b8d..d4265c80c2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CopyFeatureArrayToElementArrayFilter.cpp @@ -110,14 +110,14 @@ Parameters CopyFeatureArrayToElementArrayFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Feature Data"}); - params.insert(std::make_unique(k_SelectedFeatureArrayPath_Key, "Feature Data to Copy to Element Data", + params.insert(std::make_unique(k_SelectedFeatureArrayPath_Key, "Feature Data to Copy to Cell Data", "The DataPath to the feature data that should be copied to the cell level", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Input Cell Data Data"}); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_CreatedArraySuffix_Key, "Created Array Suffix", "The suffix to add to the input attribute array name when creating the copied array", "")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp index 3afbc7a10c..becdfb520b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateAttributeMatrixFilter.cpp @@ -39,7 +39,7 @@ Parameters CreateAttributeMatrixFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_DataObjectPath, "DataObject Path", "The complete path to the Attribute Matrix being created", DataPath{})); DynamicTableInfo tableInfo; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp index 4adf2fa638..8296858c18 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataArrayFilter.cpp @@ -68,12 +68,12 @@ Parameters CreateDataArrayFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_NumericType_Key, "Output Numeric Type", "Numeric Type of data to create", NumericType::int32)); params.insert(std::make_unique(k_InitializationValue_Key, "Initialization Value", "This value will be used to fill the new array", "0")); params.insert(std::make_unique(k_NumComps_Key, "Number of Components", "Number of components", 1)); - params.insertSeparator(Parameters::Separator{"Created DataArray"}); + params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_DataPath_Key, "Created Array", "Array storing the data", DataPath{})); params.insert(std::make_unique(k_DataFormat_Key, "Data Format", "This value will specify which data format is used by the array's data store. An empty string results in in-memory data store.", "")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp index cb821b7e09..20c53cc07e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateDataGroupFilter.cpp @@ -38,7 +38,7 @@ Parameters CreateDataGroupFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_DataObjectPath, "DataObject Path", "The complete path to the DataObject being created", DataPath{})); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp index d10f45646e..e010903492 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateFeatureArrayFromElementArrayFilter.cpp @@ -115,16 +115,16 @@ Parameters CreateFeatureArrayFromElementArrayFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Element Data"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert( - std::make_unique(k_SelectedCellArrayPath_Key, "Element Data to Copy to Feature Data", "Element Data to Copy to Feature Data", DataPath{}, nx::core::GetAllDataTypes())); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, + std::make_unique(k_SelectedCellArrayPath_Key, "Data to Copy to Feature Data", "Element Data to Copy to Feature Data", DataPath{}, nx::core::GetAllDataTypes())); + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix where the converted output feature array will be stored", DataPath({"DataContainer", "CellFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_CreatedArrayName_Key, "Created Feature Attribute Array", "The path to the copied AttributeArray", "")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp index 84763a0ddc..594602714f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp @@ -114,7 +114,7 @@ Parameters CreateGeometryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_GeometryType_Key, "Geometry Type", "The type of Geometry to create", 0, GetAllGeometryTypesAsStrings())); params.insert(std::make_unique(k_LengthUnitType_Key, "Length Unit", "The length unit to be used in the geometry", to_underlying(IGeometry::LengthUnit::Millimeter), IGeometry::GetAllLengthUnitStrings())); @@ -150,7 +150,7 @@ Parameters CreateGeometryFilter::parameters() const params.insert(std::make_unique(k_HexahedralListPath_Key, "Hexahedral List", "The complete path to the data array defining the hexahedral elements for the geometry", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::uint64}, ArraySelectionParameter::AllowedComponentShapes{{8}})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_GeometryPath_Key, "Geometry Name", "The complete path to the geometry to be created", DataPath({"Geometry"}))); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Attribute Matrix", "The name of the vertex attribute matrix to be created with the geometry", INodeGeometry0D::k_VertexDataName)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp index 78651f6264..66f787c6cc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateImageGeometryFilter.cpp @@ -57,8 +57,8 @@ Parameters CreateImageGeometryFilter::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_GeometryDataPath_Key, "Geometry Name [Data Group]", "The complete path to the Geometry being created", DataPath({"[Image Geometry]"}))); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_GeometryDataPath_Key, "Output Geometry Name", "The complete path to the Geometry being created", DataPath({"[Image Geometry]"}))); params.insert(std::make_unique(k_Dimensions_Key, "Dimensions", "The number of cells in each of the X, Y, Z directions", std::vector{20ULL, 60ULL, 200ULL}, std::vector{"X"s, "Y"s, "Z"s})); params.insert( diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp index 8b7f0c8f25..7a2e20a35c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropImageGeometryFilter.cpp @@ -182,7 +182,7 @@ Parameters CropImageGeometryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter( std::make_unique(k_UsePhysicalBounds_Key, "Use Physical Units For Bounds", "If true define physical coordinates for bounds, If false define voxel indices for bounds", false)); params.insert(std::make_unique(k_MinVoxel_Key, "Min Voxel", "Lower bound of voxels of the volume to crop out", std::vector{0, 0, 0}, @@ -195,18 +195,18 @@ Parameters CropImageGeometryFilter::parameters() const std::vector{0.0, 0.0, 0.0}, std::vector{"X", "Y", "Z"})); params.insertLinkableParameter(std::make_unique(k_RemoveOriginalGeometry_Key, "Perform In Place", "Removes the original Image Geometry after filter is completed", true)); - params.insertSeparator({"Input Geometry and Data"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert( std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "DataPath to the source Image Geometry", DataPath(), std::set{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Renumber Features Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Optional Renumber Features"}); params.insertLinkableParameter(std::make_unique(k_RenumberFeatures_Key, "Renumber Features", "Specifies if the feature IDs should be renumbered", false)); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature IDs", "DataPath to Cell Feature IDs array", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", - DataPath({"CellFeatureData"}))); + params.insert( + std::make_unique(k_FeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", DataPath({"CellFeatureData"}))); - params.insertSeparator({"Output Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The DataPath to store the created Image Geometry", DataPath())); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp index ba6a332675..5601ab7d16 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CropVertexGeometryFilter.cpp @@ -78,7 +78,7 @@ Parameters CropVertexGeometryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry to Crop", "DataPath to target VertexGeom", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Cropped Vertex Geometry", "Created VertexGeom path", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp index d94a39a2df..0c6b8bc6b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/DeleteDataFilter.cpp @@ -53,12 +53,12 @@ Parameters DeleteDataFilter::parameters() const { Parameters params; - // params.insertSeparator(Parameters::Separator{"Required Parameters"}); + // params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); // params.insert(std::make_unique(k_DeletionType_Key, "Deletion Type", "", to_underlying(DeletionType::DeleteDataPath), // ChoicesParameter::Choices{"Delete DataObject", "Delete Path to DataObject", "Delete DataObject and Unshared Child Objects", // "Delete DataObject and All Child Objects"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_DataPath_Key, "DataPaths to remove", "The complete path to the DataObjects to be removed", MultiPathSelectionParameter::ValueType{})); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp index 341254c2cf..18544b743a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateBadDataFilter.cpp @@ -57,7 +57,7 @@ Parameters ErodeDilateBadDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Operation_Key, "Operation", "Whether to dilate or erode", 0ULL, ::k_OperationChoices)); params.insert(std::make_unique(k_NumIterations_Key, "Number of Iterations", "The number of iterations to use for erosion/dilation", 2)); @@ -65,7 +65,7 @@ Parameters ErodeDilateBadDataFilter::parameters() const params.insert(std::make_unique(k_YDirOn_Key, "Y Direction", "Whether to erode/dilate in the Y direction", true)); params.insert(std::make_unique(k_ZDirOn_Key, "Z Direction", "Whether to erode/dilate in the Z direction", true)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp index 7486b56ca3..3b117f9c1d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateCoordinationNumberFilter.cpp @@ -57,7 +57,7 @@ Parameters ErodeDilateCoordinationNumberFilter::parameters() const " Number of neighboring **Cells** that can be of opposite classification before a **Cell** will be removed", 6)); params.insert(std::make_unique(k_Loop_Key, "Loop Until Gone", "Keep looping until all criteria is met", false)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Cell belongs", DataPath({"FeatureIds"}), diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp index 20e9b53925..60227fff9d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ErodeDilateMaskFilter.cpp @@ -52,7 +52,7 @@ Parameters ErodeDilateMaskFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); // Create the parameter descriptors that are needed for this filter params.insert(std::make_unique(k_Operation_Key, "Operation", "Whether to dilate (0) or erode (1)", 0ULL, ::k_OperationChoices)); @@ -61,7 +61,7 @@ Parameters ErodeDilateMaskFilter::parameters() const params.insert(std::make_unique(k_YDirOn_Key, "Y Direction", "Whether to erode/dilate in the Y direction", true)); params.insert(std::make_unique(k_ZDirOn_Key, "Z Direction", "Whether to erode/dilate in the Z direction", true)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array Path", "Boolean array where true voxels are used. False voxels are ignored.", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp index 6c63b12027..bc2dbc000c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExecuteProcessFilter.cpp @@ -52,7 +52,7 @@ Parameters ExecuteProcessFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Arguments_Key, "Command Line Arguments", "The complete command to execute.", "SomeString")); params.insertLinkableParameter(std::make_unique(k_Blocking_Key, "Should Block", "Whether to block the process while the command executes or not", false)); params.insert(std::make_unique(k_Timeout_Key, "Timeout (ms)", "The amount of time to wait for the command to start/finish when blocking is selected", 30000)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp index 73b0ee097e..31d5268015 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractComponentAsArrayFilter.cpp @@ -55,17 +55,17 @@ Parameters ExtractComponentAsArrayFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_CompNumber_Key, "Component Index to Extract", "The index of the component in each tuple to be removed", 0)); params.insertLinkableParameter( std::make_unique(k_MoveComponentsToNewArray_Key, "Move Extracted Components to New Array", "If true the extracted components will be placed in a new array", false)); params.insert(std::make_unique(k_RemoveComponentsFromArray_Key, "Remove Extracted Components from Old Array", "If true the extracted components will be deleted", false)); - params.insertSeparator(Parameters::Separator{"Required Input DataArray"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert( - std::make_unique(k_SelectedArrayPath_Key, "Multicomponent Attribute Array", "The array to extract componenets from", DataPath{}, nx::core::GetAllNumericTypes())); + std::make_unique(k_SelectedArrayPath_Key, "Multi-Component Attribute Array", "The array to extract components from", DataPath{}, nx::core::GetAllNumericTypes())); - params.insertSeparator(Parameters::Separator{"Created DataArray"}); + params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_NewArrayName_Key, "Scalar Attribute Array", "The DataArray to store the extracted components", "Extracted Component")); params.linkParameters(k_MoveComponentsToNewArray_Key, k_NewArrayName_Key, true); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp index 857ded1c45..aa1a7ad02c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.cpp @@ -129,7 +129,7 @@ Parameters ExtractInternalSurfacesFromTriangleGeometryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle Geometry", "Path to the existing Triangle Geometry", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insertSeparator(Parameters::Separator{"Input Vertex Data"}); @@ -139,7 +139,7 @@ Parameters ExtractInternalSurfacesFromTriangleGeometryFilter::parameters() const "The min and max (inclusive) Node Type values that distinguish an internal surface from an external surface", std::vector{0, 8}, std::vector{"Min", "Max"})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry Path", "Path to create the new Triangle Geometry", DataPath())); params.insert( std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Data Attribute Matrix", "Created vertex data AttributeMatrix name", INodeGeometry0D::k_VertexDataName)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp index 4303f951bb..5f6e4f488d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractPipelineToFileFilter.cpp @@ -54,7 +54,7 @@ std::vector ExtractPipelineToFileFilter::defaultTags() const Parameters ExtractPipelineToFileFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ImportFileData, "Input DREAM3D File Path", "The file path to the .dream3d that holds the pipeline to be extracted.", FileSystemPathParameter::ValueType{}, FileSystemPathParameter::ExtensionsType{".dream3d"}, FileSystemPathParameter::PathType::InputFile)); params.insertSeparator(Parameters::Separator{"Output Parameters"}); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp index 0df535b486..917319e6e8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp @@ -66,12 +66,12 @@ Parameters ExtractVertexGeometryFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ArrayHandling_Key, "Array Handling", "[0] Move or [1] Copy input data arrays", 0, ChoicesParameter::Choices{"Move Attribute Arrays", "Copy Attribute Arrays"})); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp index 78259f0157..926a5a5a1b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FeatureFaceCurvatureFilter.cpp @@ -52,7 +52,7 @@ Parameters FeatureFaceCurvatureFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_TriangleGeomPath_Key, "Triangle Geometry", "The input Triangle Geometry to compute the curvature values", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_NeighborhoodRing_Key, "Neighborhood Ring Count", "The number of ring neighbors to use", 1)); @@ -67,7 +67,7 @@ Parameters FeatureFaceCurvatureFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_UseFaceNormals_Key, "Use Face Normals for Curve Fitting", "Use the face normals for curve fitting.", true)); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_FaceAttribMatrixPath_Key, "Face Attribute Matrix", "The AttributeMatrix that holds the triangle face data.", DataPath())); params.insert(std::make_unique(k_FaceLabelsPath_Key, "Face Labels", "The DataPath to the 'Face Labels' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{2}})); @@ -78,7 +78,7 @@ Parameters FeatureFaceCurvatureFilter::parameters() const params.insert(std::make_unique(k_FaceCentroidsPath_Key, "Face Centroids", "The DataPath to the 'Face Centroids' DataArray", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{IArray::ShapeType{3}})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_PrincipalCurvature1Path_Key, "Principal Curvature 1", "Output DataPath to hold the 'Principal Curvature 1' values", DataPath())); params.insert(std::make_unique(k_PrincipalCurvature2Path_Key, "Principal Curvature 2", "Output DataPath to hold the 'Principal Curvature 2' values", DataPath())); params.insert(std::make_unique(k_PrincipalDirection1Path_Key, "Principal Direction 1", "Output DataPath to hold the 'Principal Direction 1' values", DataPath())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp index 710dcc1ba0..59c3fcdcf2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FillBadDataFilter.cpp @@ -53,12 +53,12 @@ Parameters FillBadDataFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MinAllowedDefectSize_Key, "Minimum Allowed Defect Size", "The size at which a group of bad Cells are left unfilled as a 'defect'", 1)); params.insertLinkableParameter( std::make_unique(k_StoreAsNewPhase_Key, "Store Defects as New Phase", "Whether to change the phase of 'defect' larger than the minimum allowed size above", false)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); // params.insert(std::make_unique(k_SelectedCellDataGroup_Key, "Cell Data Attribute Matrix", "Cell data Attribute Matrix", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp index aea4734395..61399b62b5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindArrayStatisticsFilter.cpp @@ -189,7 +189,7 @@ Parameters FindArrayStatisticsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Data"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Compute Statistics", "Input Attribute Array for which to compute statistics", DataPath{}, nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert( @@ -210,17 +210,17 @@ Parameters FindArrayStatisticsFilter::parameters() const "The name of the array that stores the histogram bin range(s) that contain the mode(s) of the data.", "Modal Histogram Bin Ranges")); params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Algorithm Options"}); params.insertLinkableParameter( std::make_unique(k_ComputeByIndex_Key, "Compute Statistics Per Feature/Ensemble", "Whether the statistics should be computed on a Feature/Ensemble basis", false)); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"CellData", "FeatureIds"}), + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Calculated Output Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Output Arrays"}); params.insert(std::make_unique(k_FeatureHasDataArrayName_Key, "Feature-Has-Data Array Name", "The name of the boolean array that indicates whether or not each feature contains any data. This array is especially useful to help " "determine whether or not the outputted statistics are actually valid or not for a given feature.", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp index c89705f59c..3e9ccf956b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBiasedFeaturesFilter.cpp @@ -53,18 +53,18 @@ Parameters FindBiasedFeaturesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_CalcByPhase_Key, "Apply Phase by Phase", "Whether to apply the biased Features algorithm per Ensemble", false)); params.insert(std::make_unique(k_GeometryPath_Key, "Image Geometry", "The selected geometry in which to the (biased) features belong", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Centroids", "X, Y, Z coordinates of Feature center of mass", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); params.insert(std::make_unique(k_SurfaceFeaturesArrayPath_Key, "Surface Features", "Flag of 1 if Feature touches an outer surface or of 0 if it does not", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_PhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Feature belongs. Only required if Apply Phase by Phase is checked", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_BiasedFeaturesArrayName_Key, "Biased Features", "Flag of 1 if Feature is biased or of 0 if it is not", "BiasedFeatures")); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_CalcByPhase_Key, k_PhasesArrayPath_Key, true); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp index 3cab864560..663c321cd6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryCellsFilter.cpp @@ -54,15 +54,15 @@ Parameters FindBoundaryCellsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_IgnoreFeatureZero_Key, "Ignore Feature 0", "Do not use feature 0", false)); params.insert(std::make_unique(k_IncludeVolumeBoundary_Key, "Include Volume Boundary", "Include the Cell boundaries", false)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GeometryPath_Key, "Image Geometry", "The selected geometry to which the cells belong", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_BoundaryCellsArrayName_Key, "Boundary Cells", "The number of neighboring Cells of a given Cell that belong to a different Feature than itself. Values will range from 0 to 6", "BoundaryCells")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp index 8ae1c51c86..74c221f625 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindBoundaryElementFractionsFilter.cpp @@ -51,16 +51,18 @@ Parameters FindBoundaryElementFractionsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insert(std::make_unique(k_BoundaryCellsArrayPath_Key, "Surface Elements", "DataArray containing the number of neighboring Elements of a given Element that belong to a different Feature than itself", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + params.insertSeparator(Parameters::Separator{"Input Feature Attribute Matrix"}); params.insert( std::make_unique(k_FeatureDataAMPath_Key, "Feature Data", "Parent Attribute Matrix for the Surface Element Fractions Array to be created in", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Data Object"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_BoundaryCellFractionsArrayName_Key, "Surface Element Fractions", "Name of created Data Array containing fraction of Elements belonging to the Feature that are \"surface\" Elements", "Surface Element Fractions")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMapFilter.cpp index 6d8b890a36..aefd8244cc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindDifferencesMapFilter.cpp @@ -167,7 +167,7 @@ Parameters FindDifferencesMapFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FirstInputArrayPath_Key, "First Input Array", "DataPath to the first input DataArray", DataPath{})); params.insert(std::make_unique(k_SecondInputArrayPath_Key, "Second Input Array", "DataPath to the second input DataArray", DataPath{})); params.insert(std::make_unique(k_DifferenceMapArrayPath_Key, "Difference Map", "DataPath for created Difference Map DataArray", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp index 975d2d4771..1e97fce097 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindEuclideanDistMapFilter.cpp @@ -54,7 +54,7 @@ Parameters FindEuclideanDistMapFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_CalcManhattanDist_Key, "Output arrays are Manhattan distance (int32)", "If Manhattan distance is used then results are stored as int32 otherwise results are stored as float32", true)); @@ -66,13 +66,13 @@ Parameters FindEuclideanDistMapFilter::parameters() const std::make_unique(k_DoQuadPoints_Key, "Calculate Distance to Quadruple Points", "Whether the distance of each Cell to a quadruple point between Features is calculated", true)); params.insertLinkableParameter(std::make_unique(k_SaveNearestNeighbors_Key, "Store the Nearest Boundary Cells", "Whether to store the nearest neighbors of Cell", false)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_GBDistancesArrayName_Key, "Boundary Distances", "The name of the array with the distance the cells are from the boundary of the Feature they belong to.", "GBManhattanDistances")); params.insert(std::make_unique(k_TJDistancesArrayName_Key, "Triple Line Distances", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp index b65fede5c7..ffcfcb9e07 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureCentroidsFilter.cpp @@ -54,15 +54,16 @@ Parameters FindFeatureCentroidsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry whose Features' centroids will be calculated", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The cell feature attribute matrix", + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The cell feature attribute matrix", DataPath({"Data Container", "Feature Data"}))); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_CentroidsArrayName_Key, "Centroids", "DataPath to create the 'Centroids' output array", "Centroids")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp index 13f37898b5..95f17b2327 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureClusteringFilter.cpp @@ -57,20 +57,20 @@ Parameters FindFeatureClusteringFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_NumberOfBins_Key, "Number of Bins for RDF", "Number of bins to split the RDF", 1)); params.insert(std::make_unique(k_PhaseNumber_Key, "Phase Index", "Ensemble number for which to calculate the RDF and clustering list", 1)); params.insertLinkableParameter(std::make_unique(k_RemoveBiasedFeatures_Key, "Remove Biased Features", "Remove the biased features", false)); - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter( std::make_unique(k_SetRandomSeed_Key, "Set Random Seed", "When checked, allows the user to set the seed value used to randomly generate the points in the RDF", true)); params.insert(std::make_unique(k_SeedValue_Key, "Seed Value", "The seed value used to randomly generate the points in the RDF", std::mt19937::default_seed)); params.insert(std::make_unique(k_SeedArrayName_Key, "Stored Seed Value Array Name", "Name of array holding the seed value", "FindFeatureClustering SeedValue")); - params.insertSeparator(Parameters::Separator{"Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_EquivalentDiametersArrayPath_Key, "Equivalent Diameters", "Diameter of a sphere with the same volume as the Feature", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Feature belongs", DataPath{}, @@ -80,12 +80,12 @@ Parameters FindFeatureClusteringFilter::parameters() const params.insert(std::make_unique(k_BiasedFeaturesArrayPath_Key, "Biased Features", "Specifies which features are biased and therefor should be removed if the Remove Biased Features option is on", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Cell Ensemble Attribute Matrix", "The path to the cell ensemble attribute matrix where the RDF and RDF min and max distance arrays will be stored", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_ClusteringListArrayName_Key, "Clustering List", "Distance of each Feature's centroid to every other Feature's centroid", "ClusteringList")); - params.insertSeparator(Parameters::Separator{"Created Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_RDFArrayName_Key, "Radial Distribution Function", "A histogram of the normalized frequency at each bin", "RDF")); params.insert(std::make_unique(k_MaxMinArrayName_Key, "Max and Min Separation Distances", "The max and min distance found between Features", "RDFMaxMinDistances")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.cpp similarity index 91% rename from src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.cpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.cpp index b61f9369dc..0c9cc92622 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.cpp @@ -1,4 +1,4 @@ -#include "FindNeighborsFilter.hpp" +#include "FindFeatureNeighborsFilter.hpp" #include "simplnx/DataStructure/AttributeMatrix.hpp" #include "simplnx/DataStructure/DataArray.hpp" @@ -20,59 +20,60 @@ namespace nx::core { //------------------------------------------------------------------------------ -std::string FindNeighborsFilter::name() const +std::string FindFeatureNeighborsFilter::name() const { - return FilterTraits::name; + return FilterTraits::name; } //------------------------------------------------------------------------------ -std::string FindNeighborsFilter::className() const +std::string FindFeatureNeighborsFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid FindNeighborsFilter::uuid() const +Uuid FindFeatureNeighborsFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string FindNeighborsFilter::humanName() const +std::string FindFeatureNeighborsFilter::humanName() const { return "Find Feature Neighbors"; } //------------------------------------------------------------------------------ -std::vector FindNeighborsFilter::defaultTags() const +std::vector FindFeatureNeighborsFilter::defaultTags() const { return {className(), "Statistics", "Neighbors", "Features"}; } //------------------------------------------------------------------------------ -Parameters FindNeighborsFilter::parameters() const +Parameters FindFeatureNeighborsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_StoreBoundary_Key, "Store Boundary Cells Array", "Whether to store the boundary Cells array", false)); params.insertLinkableParameter(std::make_unique(k_StoreSurface_Key, "Store Surface Features Array", "Whether to store the surface Features array", false)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "The geometry in which to identify feature neighbors", DataPath({"DataContainer"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsPath_Key, "Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), + params.insert(std::make_unique(k_FeatureIdsPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellFeaturesPath_Key, "Cell Feature AttributeMatrix", "Feature Attribute Matrix of the selected Feature Ids", + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_CellFeaturesPath_Key, "Feature Attribute Matrix", "Feature Attribute Matrix of the selected Feature Ids", DataPath({"DataContainer", "CellFeatureData"}))); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique( k_BoundaryCellsName_Key, "Boundary Cells", "The number of neighboring Cells of a given Cell that belong to a different Feature than itself. Values will range from 0 to 6. Only created if Store Boundary Cells Array is checked", "BoundaryCells")); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_NumNeighborsName_Key, "Number of Neighbors", "Number of contiguous neighboring Features for a given Feature", "NumNeighbors")); params.insert(std::make_unique(k_NeighborListName_Key, "Neighbor List", "List of the contiguous neighboring Features for a given Feature", "NeighborList")); params.insert(std::make_unique(k_SharedSurfaceAreaName_Key, "Shared Surface Area List", @@ -88,13 +89,14 @@ Parameters FindNeighborsFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer FindNeighborsFilter::clone() const +IFilter::UniquePointer FindFeatureNeighborsFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult FindNeighborsFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +IFilter::PreflightResult FindFeatureNeighborsFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const { auto storeBoundaryCells = args.value(k_StoreBoundary_Key); auto storeSurfaceFeatures = args.value(k_StoreSurface_Key); @@ -164,8 +166,8 @@ IFilter::PreflightResult FindNeighborsFilter::preflightImpl(const DataStructure& } //------------------------------------------------------------------------------ -Result<> FindNeighborsFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const +Result<> FindFeatureNeighborsFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, + const std::atomic_bool& shouldCancel) const { auto storeBoundaryCells = args.value(k_StoreBoundary_Key); auto storeSurfaceFeatures = args.value(k_StoreSurface_Key); @@ -434,9 +436,9 @@ constexpr StringLiteral k_SurfaceFeaturesArrayNameKey = "SurfaceFeaturesArrayNam } // namespace SIMPL } // namespace -Result FindNeighborsFilter::FromSIMPLJson(const nlohmann::json& json) +Result FindFeatureNeighborsFilter::FromSIMPLJson(const nlohmann::json& json) { - Arguments args = FindNeighborsFilter().getDefaultArguments(); + Arguments args = FindFeatureNeighborsFilter().getDefaultArguments(); std::vector> results; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp similarity index 84% rename from src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.hpp rename to src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp index a064c18038..a9aa3e17fc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp @@ -8,17 +8,17 @@ namespace nx::core { -class SIMPLNXCORE_EXPORT FindNeighborsFilter : public IFilter +class SIMPLNXCORE_EXPORT FindFeatureNeighborsFilter : public IFilter { public: - FindNeighborsFilter() = default; - ~FindNeighborsFilter() noexcept override = default; + FindFeatureNeighborsFilter() = default; + ~FindFeatureNeighborsFilter() noexcept override = default; - FindNeighborsFilter(const FindNeighborsFilter&) = delete; - FindNeighborsFilter(FindNeighborsFilter&&) noexcept = delete; + FindFeatureNeighborsFilter(const FindFeatureNeighborsFilter&) = delete; + FindFeatureNeighborsFilter(FindFeatureNeighborsFilter&&) noexcept = delete; - FindNeighborsFilter& operator=(const FindNeighborsFilter&) = delete; - FindNeighborsFilter& operator=(FindNeighborsFilter&&) noexcept = delete; + FindFeatureNeighborsFilter& operator=(const FindFeatureNeighborsFilter&) = delete; + FindFeatureNeighborsFilter& operator=(FindFeatureNeighborsFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_StoreBoundary_Key = "store_boundary_cells"; @@ -106,4 +106,4 @@ class SIMPLNXCORE_EXPORT FindNeighborsFilter : public IFilter }; } // namespace nx::core -SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindNeighborsFilter, "7177e88c-c3ab-4169-abe9-1fdaff20e598"); +SIMPLNX_DEF_FILTER_TRAITS(nx::core, FindFeatureNeighborsFilter, "7177e88c-c3ab-4169-abe9-1fdaff20e598"); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp index 54ee0e40db..a0c2c4b57c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.cpp @@ -51,15 +51,17 @@ Parameters FindFeaturePhasesBinaryFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32})); + + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Data Array that specifies if the Cell is to be counted in the algorithm", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellDataAMPath_Key, "Cell Data Attribute Matrix", "The Cell Data Attribute Matrix within the Image Geometry where the Binary Phases Array will be created", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Cell Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_FeaturePhasesArrayName_Key, "Binary Feature Phases Array Name", "Created Data Array name to specify to which Ensemble each Feature belongs", "Binary Phases Array")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp index f2c62937ca..390bd0dfae 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindFeaturePhasesFilter.cpp @@ -54,12 +54,13 @@ Parameters FindFeaturePhasesFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Element belongs", DataPath({"Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"CellData", "FeatureIds"}), + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellFeaturesAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_CellFeaturesAttributeMatrixPath_Key, "Feature Attribute Matrix", "The AttributeMatrix that stores the feature data for the input **Feature Ids**.", DataPath({"CellFeatureData"}))); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert( std::make_unique(k_FeaturePhasesArrayName_Key, "Feature Phases", "The name of the feature attribute matrix in which to store the found feature phases array", "Phases")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp index 3ea8ba5096..f9545d8782 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindLargestCrossSectionsFilter.cpp @@ -54,17 +54,16 @@ Parameters FindLargestCrossSectionsFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Plane_Key, "Plane of Interest", "Specifies which plane to consider when determining the maximum cross-section for each Feature", 0, ChoicesParameter::Choices{"XY", "XZ", "YZ"})); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The complete path to the input image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); - params.insert( - std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix", DataPath{})); params.insert(std::make_unique(k_LargestCrossSectionsArrayName_Key, "Largest Cross Sections", "Area of largest cross-section for Feature perpendicular to the user specified direction", "LargestCrossSections")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatisticsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatisticsFilter.cpp index 4cabd9256b..f3d7dfd9a6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatisticsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborListStatisticsFilter.cpp @@ -254,7 +254,7 @@ Parameters FindNeighborListStatisticsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FindLength_Key, "Find Length", "Specifies whether or not the filter creates the Length array during calculations", true)); params.insert(std::make_unique(k_FindMinimum_Key, "Find Minimum", "Specifies whether or not the filter creates the Minimum array during calculations", true)); params.insert(std::make_unique(k_FindMaximum_Key, "Find Maximum", "Specifies whether or not the filter creates the Maximum array during calculations", true)); @@ -264,11 +264,11 @@ Parameters FindNeighborListStatisticsFilter::parameters() const std::make_unique(k_FindStandardDeviation_Key, "Find Standard Deviation", "Specifies whether or not the filter creates the Standard Deviation array during calculations", true)); params.insert(std::make_unique(k_FindSummation_Key, "Find Summation", "Specifies whether or not the filter creates the Summation array during calculations", true)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_InputNeighborListPath_Key, "NeighborList to Compute Statistics", "Input Data Array to compute statistics", DataPath(), nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_LengthName_Key, "Length", "Path to create the Length array during calculations", "Length")); params.insert(std::make_unique(k_MinimumName_Key, "Minimum", "Path to create the Minimum array during calculations", "Minimum")); params.insert(std::make_unique(k_MaximumName_Key, "Maximum", "Path to create the Maximum array during calculations", "Maximum")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp index 66852ea0e2..573393d594 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNeighborhoodsFilter.cpp @@ -54,14 +54,14 @@ Parameters FindNeighborhoodsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MultiplesOfAverage_Key, "Multiples of Average Diameter", "Defines the search radius to use when looking for 'neighboring' Features", 1.0F)); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath({"Data Container"}), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique( k_EquivalentDiametersArrayPath_Key, "Equivalent Diameters", "Path to the array specifying the diameter of a sphere with the same volume as the Feature", DataPath({"CellFeatureData", "EquivalentDiameters"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -71,11 +71,11 @@ Parameters FindNeighborhoodsFilter::parameters() const params.insert(std::make_unique(k_CentroidsArrayPath_Key, "Centroids", "Path to the array specifying the X, Y, Z coordinates of Feature center of mass", DataPath({"CellFeatureData", "Centroids"}), ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_NeighborhoodsArrayName_Key, "Neighborhoods", "Number of Features that have their centroid within the user specified multiple of equivalent sphere diameters from each Feature", "Neighborhoods")); - params.insert(std::make_unique(k_NeighborhoodListArrayName_Key, "NeighborhoodList", + params.insert(std::make_unique(k_NeighborhoodListArrayName_Key, "Neighborhood List", "List of the Features whose centroids are within the user specified multiple of equivalent sphere diameter from each Feature", "NeighborhoodList")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp index b5b698b54b..21956ea1ce 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindNumFeaturesFilter.cpp @@ -50,16 +50,16 @@ Parameters FindNumFeaturesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Objects: Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_FeaturePhasesArrayPath_Key, "Feature Phases", "Array specifying which Ensemble each Feature belongs", DataPath({"DataContainer", "FeatureData", "Phases"}), nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Required Objects: Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_EnsembleAttributeMatrixPath_Key, "Ensemble Attribute Matrix", "The path to the ensemble attribute matrix where the number of features array will be stored", DataPath({"DataContainer", "EnsembleData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Objects: Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_NumFeaturesArrayName_Key, "Number of Features", "The number of Features that belong to each Ensemble", "Number of Features")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp index a14b5c9ab4..fd0f55f69a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.cpp @@ -54,19 +54,19 @@ Parameters FindSurfaceAreaToVolumeFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_CalculateSphericity_Key, "Calculate Sphericity", "Whether or not to calculate the sphericity of each Feature", false)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique( k_NumCellsArrayPath_Key, "Number of Cells", "Number of Cells that are owned by the Feature. This value does not place any distinction between Cells that may be of a different size", DataPath({"CellFeatureData", "NumElements"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_SurfaceAreaVolumeRatioArrayName_Key, "Surface Area to Volume Ratio", "Ratio of surface area to volume for each Feature. The units are inverse length", "SurfaceAreaVolumeRatio")); params.insert(std::make_unique(k_SphericityArrayName_Key, "Sphericity Array Name", "The sphericity of each feature", "Sphericity")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeaturesFilter.cpp index 2d49a1a751..280381d1b5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindSurfaceFeaturesFilter.cpp @@ -229,20 +229,20 @@ Parameters FindSurfaceFeaturesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MarkFeature0Neighbors, "Mark Feature 0 Neighbors", "Marks features that are neighbors with feature 0. If this option is off, only features that reside on the edge of the geometry will be marked.", true)); params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_FeatureGeometryPath_Key, "Feature Geometry", "The geometry in which to find surface features", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insertSeparator(Parameters::Separator{"Input Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Cell Feature Attribute Matrix", + params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "The path to the cell feature attribute matrix associated with the input feature ids array", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_SurfaceFeaturesArrayName_Key, "Surface Features", "The created surface features array. Flag of 1 if Feature touches an outer surface or of 0 if it does not", "SurfaceFeatures")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp index a5db3f6547..68efaa0471 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomCentroidsFilter.cpp @@ -51,14 +51,14 @@ Parameters FindTriangleGeomCentroidsFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_CentroidsArrayName_Key, "Calculated Centroids", "Centroid values created in the Face Feature Data", "Centroids")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp index f0a26478f3..856dc1123d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindTriangleGeomSizesFilter.cpp @@ -52,14 +52,14 @@ Parameters FindTriangleGeomSizesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Required Face Data"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); - params.insertSeparator(Parameters::Separator{"Required Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Face Feature Data"}); params.insert(std::make_unique(k_FeatureAttributeMatrixPath_Key, "Face Feature Attribute Matrix", "The DataPath to the AttributeMatrix that holds feature data for the faces", DataPath({"TriangleDataContainer", "FaceFeatureData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_VolumesArrayName_Key, "Calculated Volumes", "Calculated volumes data created in the Face Feature Data Attribute Matrix", "Volumes")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp index 3801404c9d..77bd264473 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVertexToTriangleDistancesFilter.cpp @@ -59,7 +59,7 @@ Parameters FindVertexToTriangleDistancesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Arrays"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Source Vertex Geometry", "The Vertex Geometry point cloud to map to triangles", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Target Triangle Geometry", "The triangle geometry to compare against", DataPath{}, @@ -67,7 +67,7 @@ Parameters FindVertexToTriangleDistancesFilter::parameters() const params.insert( std::make_unique(k_TriangleNormalsArrayPath_Key, "Triangle Normals", "The triangle geometry's normals array", DataPath{}, std::set{DataType::float64})); - params.insertSeparator(Parameters::Separator{"Created Output Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Output Arrays"}); params.insert(std::make_unique(k_DistancesArrayName_Key, "Distances Array", "The array to store distance between vertex and triangle", "")); params.insert(std::make_unique(k_ClosestTriangleIdArrayName_Key, "Closest Triangle Ids Array", "The array to store the ID of the closest triangle", "")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp index b020689fa6..295097731a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FindVolFractionsFilter.cpp @@ -51,15 +51,15 @@ Parameters FindVolFractionsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Objects: Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Array specifying which Ensemble each Cell belong", DataPath({"DataContainer", "CellData", "Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Objects: Cell Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Input Ensemble Data"}); params.insert(std::make_unique(k_CellEnsembleAttributeMatrixPath_Key, "Cell Ensemble Attribute Matrix", "The path to the cell ensemble attribute matrix where the output volume fractions array will be stored", DataPath({"DataContainer", "CellEnsembleData"}), DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Created Objects: Ensemble Data"}); + params.insertSeparator(Parameters::Separator{"Output Ensemble Data"}); params.insert(std::make_unique(k_VolFractionsArrayName_Key, "Volume Fractions", "Fraction of volume that belongs to each Ensemble", "Volume Fractions")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp index bf731d993b..04fc38157e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/FlyingEdges3DFilter.cpp @@ -56,16 +56,16 @@ Parameters FlyingEdges3DFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_IsoVal_Key, "Contour Value", "The value to contour on", 1.0)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SelectedDataArrayPath_Key, "Data Array to Contour", "This is the data that will be checked for the contouring iso value", DataPath{}, GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Name of Output Triangle Geometry", "This is where the contouring line will be stored", DataPath({"Contouring Geometry"}))); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp index c60a632828..b76a5c8a68 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateColorTableFilter.cpp @@ -66,10 +66,10 @@ Parameters GenerateColorTableFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator({"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedPreset_Key, "Select Preset...", "Select a preset color scheme to apply to the created array", ColorTableUtilities::GetDefaultRGBPresetName())); - params.insertSeparator({"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPath_Key, "Data Array", "The complete path to the data array from which to create the rgb array by applying the selected preset color scheme", DataPath{}, nx::core::GetAllDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -78,13 +78,13 @@ Parameters GenerateColorTableFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Whether to assign a black color to 'bad' Elements", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the data array used to define Elements as good or bad.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_InvalidColorValue_Key, "Masked Voxel Color (RGB)", "The color to assign to voxels that have a mask value of FALSE", + params.insert(std::make_unique(k_InvalidColorValue_Key, "Masked Color (RGB)", "The color to assign to voxels that have a mask value of FALSE", VectorUInt8Parameter::ValueType{0, 0, 0}, std::vector{"Red", "Green", "Blue"})); // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, true); params.linkParameters(k_UseMask_Key, k_InvalidColorValue_Key, true); - params.insertSeparator({"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique( k_RgbArrayPath_Key, "Output RGB Array", "The rgb array created by normalizing each element of the input array and converting to a color based on the selected preset color scheme", "")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp index aa21d2ec12..7a8fb83702 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/GenerateVectorColorsFilter.cpp @@ -63,11 +63,11 @@ Parameters GenerateVectorColorsFilter::parameters() const params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Used to define Elements as good or bad ", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean, DataType::uint8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_VectorsArrayPath_Key, "Vector Attribute Array", "Vectors the colors will represent", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insertSeparator(Parameters::Separator{"Created Element Data Object"}); + params.insertSeparator(Parameters::Separator{"Output Element Data Object"}); params.insert(std::make_unique(k_CellVectorColorsArrayName_Key, "Vector Colors", "RGB colors", "Vector Colors Array")); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp index 4b51845c65..32d1c605e7 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IdentifySampleFilter.cpp @@ -263,7 +263,7 @@ Parameters IdentifySampleFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FillHoles_Key, "Fill Holes in Largest Feature", "Whether to fill holes within sample after it is identified", true)); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "DataPath to the target ImageGeom", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp index 76f2eb8f0c..b7c8630af0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeDataFilter.cpp @@ -428,10 +428,8 @@ Parameters InitializeDataFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_ArrayPath_Key, "Any Component Array", "The data array in which to initialize the data", DataPath{}, nx::core::GetAllDataTypes())); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); - params.insertSeparator(Parameters::Separator{"Data Initialization"}); params.insertLinkableParameter(std::make_unique(k_InitType_Key, "Initialization Type", "Method for determining the what values of the data in the array should be initialized to", static_cast(0), ChoicesParameter::Choices{"Fill Value", "Incremental", "Random", "Random With Range"})); // sequence dependent DO NOT REORDER @@ -454,6 +452,9 @@ Parameters InitializeDataFilter::parameters() const 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.insertSeparator(Parameters::Separator{"Input Data Array"}); + params.insert(std::make_unique(k_ArrayPath_Key, "Any Component Array", "The data array in which to initialize the data", DataPath{}, nx::core::GetAllDataTypes())); + // Associate the Linkable Parameter(s) to the children parameters that they control /* Using Fill Value */ params.linkParameters(k_InitType_Key, k_InitValue_Key, static_cast(0)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp index 83423bb74d..74199b08f5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InitializeImageGeomCellDataFilter.cpp @@ -188,12 +188,12 @@ Parameters InitializeImageGeomCellDataFilter::parameters() const Parameters params; // TODO: restrict types - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "InitializeImageGeomCellDataFilter SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MinPoint_Key, "Min Point", "The minimum x, y, z bound in cells", std::vector{0, 0, 0}, std::vector{"X (Column)", "Y (Row)", "Z (Plane)"})); params.insert(std::make_unique(k_MaxPoint_Key, "Max Point", "The maximum x, y, z bound in cells", std::vector{0, 0, 0}, @@ -206,7 +206,7 @@ Parameters InitializeImageGeomCellDataFilter::parameters() const params.linkParameters(k_InitType_Key, k_InitValue_Key, std::make_any(0)); params.linkParameters(k_InitType_Key, k_InitRange_Key, std::make_any(2)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_CellArrayPaths_Key, "Cell Arrays", "The cell data arrays in which to initialize a sub-volume to zeros", std::vector{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Image Geometry", "The geometry containing the cell data for which to initialize", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp index cac327b61d..595f26c115 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/InterpolatePointCloudToRegularGridFilter.cpp @@ -178,8 +178,8 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); params.insertLinkableParameter(std::make_unique(k_StoreKernelDistances_Key, "Store Kernel Distances", "Specifies whether or not to store kernel distances", false)); params.insertLinkableParameter( std::make_unique(k_InterpolationTechnique_Key, "Interpolation Technique", "Selected Interpolation Technique", 0, std::vector{"Uniform", "Gaussian"})); @@ -188,7 +188,7 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const params.insert(std::make_unique(k_GaussianSigmas_Key, "Gaussian Sigmas", "Specifies the Gaussian sigmas", std::vector{1.0f, 1.0f, 1.0f}, std::vector{"x", "y", "z"})); - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry to Interpolate", "DataPath to geometry to interpolate", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Interpolated Image Geometry", "DataPath to interpolated geometry", DataPath{}, @@ -204,7 +204,7 @@ Parameters InterpolatePointCloudToRegularGridFilter::parameters() const MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, GetAllDataTypes(), MultiArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_InterpolatedGroupName_Key, "Interpolated Group", "DataPath to created DataGroup for interpolated data", "InterpolatedData")); params.insert(std::make_unique(k_KernelDistancesArrayName_Key, "Kernel Distances Group", "DataPath to created DataGroup for kernel distances data", "KernelDistances")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp index 21e6acbc25..8d63dac01e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/IterativeClosestPointFilter.cpp @@ -100,15 +100,15 @@ Parameters IterativeClosestPointFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_NumIterations_Key, "Number of Iterations", "The number of times to run the algorithm [more increases accuracy]", 1)); params.insert(std::make_unique(k_ApplyTransformation_Key, "Apply Transformation to Moving Geometry", "If checked, geometry will be updated implicitly", false)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_MovingVertexPath_Key, "Moving Vertex Geometry", "The geometry to align [mutable]", DataPath())); params.insert(std::make_unique(k_TargetVertexPath_Key, "Target Vertex Geometry", "The geometry to be matched against [immutable]", DataPath())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_TransformArrayPath_Key, "Output Transform Array", "This is the array to store the transform matrix in", DataPath())); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp index fe3398a414..050a06ee35 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMeansFilter.cpp @@ -66,25 +66,27 @@ Parameters KMeansFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "KMeans SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", - DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean})); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InitClusters_Key, "Number of Clusters", "This will be the tuple size for Cluster Attribute Matrix and the values within", 0)); params.insert( std::make_unique(k_DistanceMetric_Key, "Distance Metric", "Distance Metric type to be used for calculations", to_underlying(KUtilities::DistanceMetric::Euclidean), ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", + DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean})); + + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to cluster from", DataPath{}, nx::core::GetAllNumericTypes())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cluster Ids Array Name", "name of the ids array to be created in Attribute Array to Cluster's parent group", "Cluster Ids")); params.insert(std::make_unique(k_FeatureAMPath_Key, "Cluster Attribute Matrix", "name and path of Attribute Matrix to hold Cluster Data", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp index dbe94930be..508a6e0fb1 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/KMedoidsFilter.cpp @@ -66,13 +66,13 @@ Parameters KMedoidsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "KMedoids SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean})); params.insert(std::make_unique(k_InitClusters_Key, "Number of Clusters", "This will be the tuple size for Cluster Attribute Matrix and the values within", 0)); @@ -80,10 +80,10 @@ Parameters KMedoidsFilter::parameters() const std::make_unique(k_DistanceMetric_Key, "Distance Metric", "Distance Metric type to be used for calculations", to_underlying(KUtilities::DistanceMetric::Euclidean), ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Cluster", "The array to find the medoids for", DataPath{}, nx::core::GetAllNumericTypes())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Cluster Ids Array Name", "name of the ids array to be created in Attribute Array to Cluster's parent group", "Cluster Ids")); params.insert(std::make_unique(k_FeatureAMPath_Key, "Cluster Attribute Matrix", "name and path of Attribute Matrix to hold Cluster Data", DataPath{})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp index 728f983b8b..a5609409c4 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LabelTriangleGeometryFilter.cpp @@ -51,11 +51,11 @@ Parameters LabelTriangleGeometryFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriangleGeomPath_Key, "Triangle Geometry", "The CAD Geometry to be labeled (TriangleGeom)", DataPath{}, GeometrySelectionParameter::AllowedTypes{GeometrySelectionParameter::AllowedType::Triangle})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_CreatedRegionIdsPath_Key, "Region Ids", "The triangle id array for indexing into triangle groupings", DataPath({"Region Ids"}))); params.insert(std::make_unique(k_TriangleAttributeMatrixName_Key, "Cell Feature Attribute Matrix Name", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp index 97161f7814..38312a3e78 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/LaplacianSmoothingFilter.cpp @@ -50,17 +50,7 @@ std::vector LaplacianSmoothingFilter::defaultTags() const Parameters LaplacianSmoothingFilter::parameters() const { Parameters params; - - params.insertSeparator(Parameters::Separator{"Input Geometry and Node Type Array"}); - - // Create the parameter descriptors that are needed for this filter - params.insert(std::make_unique(k_TriangleGeometryDataPath_Key, "Triangle Geometry", - "The complete path to the surface mesh Geometry for which to apply Laplacian smoothing", DataPath{}, - GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle, IGeometry::Type::Tetrahedral})); - params.insertSeparator(Parameters::Separator{"Vertex Data"}); - params.insert(std::make_unique(k_SurfaceMeshNodeTypeArrayPath_Key, "Node Type", "The complete path to the array specifying the type of node in the Geometry", DataPath{}, - ArraySelectionParameter::AllowedTypes{DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Smoothing Values"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique( k_IterationSteps_Key, "Iteration Steps", @@ -77,6 +67,15 @@ Parameters LaplacianSmoothingFilter::parameters() const params.insert( std::make_unique(k_SurfaceQuadPointLambda_Key, "Outer Quadruple Points Lambda", "Value of λ for the quadruple Points that lie on the outer surface of the volume.", 0.0f)); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); + // Create the parameter descriptors that are needed for this filter + params.insert(std::make_unique(k_TriangleGeometryDataPath_Key, "Triangle Geometry", + "The complete path to the surface mesh Geometry for which to apply Laplacian smoothing", DataPath{}, + GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle, IGeometry::Type::Tetrahedral})); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + params.insert(std::make_unique(k_SurfaceMeshNodeTypeArrayPath_Key, "Node Type", "The complete path to the array specifying the type of node in the Geometry", DataPath{}, + ArraySelectionParameter::AllowedTypes{DataType::int8}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + // Associate the Linkable Parameter(s) to the children parameters that they control params.linkParameters(k_UseTaubinSmoothing_Key, k_MuFactor_Key, true); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp index 1561eacc39..abdd3a422f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MapPointCloudToRegularGridFilter.cpp @@ -226,16 +226,16 @@ Parameters MapPointCloudToRegularGridFilter::parameters() const params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Existing Image Geometry", "Path to the existing Image Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Input Vertex Geometry Information"}); + params.insertSeparator(Parameters::Separator{"Input Vertex Geometry"}); params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); - params.insertSeparator(Parameters::Separator{"Input Vertex Mask Selection"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); params.insert(std::make_unique(k_InputMaskPath_Key, "Mask", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_VoxelIndicesName_Key, "Created Voxel Indices", "Path to the created Voxel Indices array", "Voxel Indices")); params.insert(std::make_unique(k_CellDataName_Key, "Created Cell Data Name", "The name of the cell data attribute matrix to be created within the created Image Geometry", ImageGeom::k_CellDataName)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.cpp index 9bebeac9f5..00914e24ef 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.cpp @@ -22,17 +22,16 @@ constexpr int64 k_MissingFeaturePhasesError = -251; constexpr int32 k_InconsistentTupleCount = -252; constexpr int32 k_FetchChildArrayError = -5559; -void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const std::atomic_bool& shouldCancel) +Result<> assignBadPoints(DataStructure& dataStructure, const Arguments& args, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) { auto imageGeomPath = args.value(MinNeighborsFilter::k_SelectedImageGeometryPath_Key); auto featureIdsPath = args.value(MinNeighborsFilter::k_FeatureIdsPath_Key); auto numNeighborsPath = args.value(MinNeighborsFilter::k_NumNeighborsPath_Key); auto ignoredVoxelArrayPaths = args.value>(MinNeighborsFilter::k_IgnoredVoxelArrays_Key); - auto cellDataAttrMatrix = args.value(MinNeighborsFilter::k_CellDataAttributeMatrixPath_Key); + auto cellDataAttrMatrix = featureIdsPath.getParent(); auto& featureIdsArray = dataStructure.getDataRefAs(featureIdsPath); auto& numNeighborsArray = dataStructure.getDataRefAs(numNeighborsPath); - auto& featureIds = featureIdsArray.getDataStoreRef(); auto applyToSinglePhase = args.value(MinNeighborsFilter::k_ApplyToSinglePhase_Key); @@ -62,52 +61,67 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const int32 good = 1; int32 current = 0; int32 most = 0; - int64 neighpoint = 0; - usize numfeatures = numNeighborsArray.getNumberOfTuples(); + int64 neighborPoint = 0; + usize numFeatures = numNeighborsArray.getNumberOfTuples(); - int64 neighpoints[6] = {0, 0, 0, 0, 0, 0}; - neighpoints[0] = -dims[0] * dims[1]; - neighpoints[1] = -dims[0]; - neighpoints[2] = -1; - neighpoints[3] = 1; - neighpoints[4] = dims[0]; - neighpoints[5] = dims[0] * dims[1]; + int64 neighborPointIdx[6] = {0, 0, 0, 0, 0, 0}; + neighborPointIdx[0] = -dims[0] * dims[1]; + neighborPointIdx[1] = -dims[0]; + neighborPointIdx[2] = -1; + neighborPointIdx[3] = 1; + neighborPointIdx[4] = dims[0]; + neighborPointIdx[5] = dims[0] * dims[1]; usize counter = 1; - int64 count = 0; - int64 kstride = 0, jstride = 0; - int32 featurename = 0, feature = 0; + int64 voxelIndex = 0; + int64 kStride = 0; + int64 jStride = 0; + int32 featureName = 0; + int32 feature = 0; int32 neighbor = 0; - std::vector n(numfeatures + 1, 0); + std::vector n(numFeatures + 1, 0); std::vector badFeatureIdIndexes; + + int32_t progInt = 0; + auto start = std::chrono::steady_clock::now(); + while(counter != 0) { + auto now = std::chrono::steady_clock::now(); + // Only send updates every 1 second + if(std::chrono::duration_cast(now - start).count() > 1000) + { + std::string message = fmt::format("Finding voxels to be assigned Counter = {}", counter); + messageHandler(nx::core::IFilter::ProgressMessage{nx::core::IFilter::Message::Type::Info, message, progInt}); + start = now; + } + if(shouldCancel) { - return; + return {}; } counter = 0; badFeatureIdIndexes.clear(); for(int64 k = 0; k < dims[2]; k++) { - kstride = dims[0] * dims[1] * k; + kStride = dims[0] * dims[1] * k; for(int64 j = 0; j < dims[1]; j++) { - jstride = dims[0] * j; + jStride = dims[0] * j; for(int64 i = 0; i < dims[0]; i++) { - count = kstride + jstride + i; - featurename = featureIds[count]; - if(featurename < 0) + voxelIndex = kStride + jStride + i; + featureName = featureIds[voxelIndex]; + if(featureName < 0) { - badFeatureIdIndexes.push_back(count); + badFeatureIdIndexes.push_back(voxelIndex); counter++; current = 0; most = 0; for(int32 l = 0; l < 6; l++) { good = 1; - neighpoint = count + neighpoints[l]; + neighborPoint = voxelIndex + neighborPointIdx[l]; if(l == 0 && k == 0) { good = 0; @@ -134,7 +148,7 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const } if(good == 1) { - feature = featureIds[neighpoint]; + feature = featureIds[neighborPoint]; if(feature >= 0) { n[feature]++; @@ -142,7 +156,7 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const if(current > most) { most = current; - neighbors[count] = neighpoint; + neighbors[voxelIndex] = neighborPoint; } } } @@ -150,7 +164,7 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const for(int32 l = 0; l < 6; l++) { good = 1; - neighpoint = count + neighpoints[l]; + neighborPoint = voxelIndex + neighborPointIdx[l]; if(l == 0 && k == 0) { good = 0; @@ -177,7 +191,7 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const } if(good == 1) { - feature = featureIds[neighpoint]; + feature = featureIds[neighborPoint]; if(feature >= 0) { n[feature] = 0; @@ -185,26 +199,46 @@ void assignBadPoints(DataStructure& dataStructure, const Arguments& args, const } } } + else if(featureName >= numFeatures) + { + std::string message = fmt::format("Error: Found a feature Id '{}' that is >= the number of features '{}' at voxel index X={},Y={},Z={}.", featureName, numFeatures, i, j, k); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); + return MakeErrorResult(-55567, message); + } } } } // TODO This can be parallelized much like NeighborOrientationCorrelation // Only iterate over the cell data with a featureId = -1; - for(const auto& featureIdIndex : badFeatureIdIndexes) + for(const auto& cellArrayPath : cellDataArrayPaths) { - featurename = featureIds[featureIdIndex]; - neighbor = neighbors[featureIdIndex]; - if(featurename < 0 && neighbor >= 0 && featureIds[neighbor] >= 0) + if(shouldCancel) + { + return {}; + } + auto* voxelArray = dataStructure.getDataAs(cellArrayPath); + size_t arraySize = voxelArray->size(); + for(const auto& featureIdIndex : badFeatureIdIndexes) { - for(const auto& cellArrayPath : cellDataArrayPaths) + featureName = featureIds[featureIdIndex]; + neighbor = neighbors[featureIdIndex]; + if((neighbor >= arraySize || featureIdIndex >= arraySize) && (featureName < 0 && neighbor >= 0 && featureIds[neighbor] >= 0)) { - auto* voxelArray = dataStructure.getDataAs(cellArrayPath); - dynamic_cast(voxelArray)->copyTuple(neighbor, featureIdIndex); + std::string message = + fmt::format("Out of range: While trying to copy a tuple from index {} to index {}\n Array Name: {}\n Num. Tuples: {}", neighbor, featureIdIndex, cellArrayPath.toString(), arraySize); + messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); + return MakeErrorResult(-55568, message); + } + + if(featureName < 0 && neighbor >= 0 && featureIds[neighbor] >= 0) + { + voxelArray->copyTuple(neighbor, featureIdIndex); } } } } + return {}; } nonstd::expected, Error> mergeContainedFeatures(DataStructure& dataStructure, const Arguments& args, const std::atomic_bool& shouldCancel) @@ -316,21 +350,19 @@ Parameters MinNeighborsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MinNumNeighbors_Key, "Minimum Number Neighbors", "Number of neighbors a Feature must have to remain as a Feature", 0)); params.insertLinkableParameter(std::make_unique(k_ApplyToSinglePhase_Key, "Apply to Single Phase Only", "Whether to apply minimum to single ensemble or all ensembles", false)); params.insert(std::make_unique(k_PhaseNumber_Key, "Phase Index", "Which Ensemble to apply minimum to. Only needed if Apply to Single Phase Only is checked", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_CellDataAttributeMatrixPath_Key, "Cell Attribute Matrix", - "The cell data attribute matrix in which to apply the minimum neighbors algorithm", DataPath({"Data Container", "CellData"}))); - params.insert(std::make_unique(k_FeatureIdsPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsPath_Key, "Cell Feature Ids", "Specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); params.insert(std::make_unique(k_NumNeighborsPath_Key, "Number of Neighbors", "Number of contiguous neighboring Features for each Feature", DataPath({"Data Container", "Feature Data", "NumNeighbors"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -453,17 +485,23 @@ Result<> MinNeighborsFilter::executeImpl(DataStructure& dataStructure, const Arg return {nonstd::make_unexpected(std::vector{activeObjectsResult.error()})}; } - auto cellDataAttrMatrix = args.value(MinNeighborsFilter::k_CellDataAttributeMatrixPath_Key); - auto result = nx::core::GetAllChildDataPaths(dataStructure, cellDataAttrMatrix, DataObject::Type::DataArray); + auto featureIdsPath = args.value(MinNeighborsFilter::k_FeatureIdsPath_Key); + + // The Cell Attribute Matrix is the parent of the "Feature Ids" array. Always. + auto cellDataAttrMatrixPath = featureIdsPath.getParent(); + auto result = nx::core::GetAllChildDataPaths(dataStructure, cellDataAttrMatrixPath, DataObject::Type::DataArray); if(!result.has_value()) { - return MakeErrorResult(-5556, fmt::format("Error fetching all Data Arrays from Group '{}'", cellDataAttrMatrix.toString())); + return MakeErrorResult(-5556, fmt::format("Error fetching all Data Arrays from Attribute Matrix '{}'", cellDataAttrMatrixPath.toString())); } // Run the algorithm. - assignBadPoints(dataStructure, args, shouldCancel); + auto assignBadPointsResult = assignBadPoints(dataStructure, args, messageHandler, shouldCancel); + if(assignBadPointsResult.invalid()) + { + return assignBadPointsResult; + } - auto featureIdsPath = args.value(MinNeighborsFilter::k_FeatureIdsPath_Key); auto& featureIdsArray = dataStructure.getDataRefAs(featureIdsPath); auto numNeighborsPath = args.value(MinNeighborsFilter::k_NumNeighborsPath_Key); @@ -481,7 +519,7 @@ Result<> MinNeighborsFilter::executeImpl(DataStructure& dataStructure, const Arg std::string message = fmt::format("Feature Count Changed: Previous: {} New: {}", currentFeatureCount, count); messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); - nx::core::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArray, currentFeatureCount, messageHandler); + nx::core::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArray, currentFeatureCount, messageHandler, shouldCancel); return {}; } @@ -510,8 +548,7 @@ Result MinNeighborsFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_ApplyToSinglePhaseKey, k_ApplyToSinglePhase_Key)); results.push_back(SIMPLConversion::ConvertParameter>(args, json, SIMPL::k_PhaseNumberKey, k_PhaseNumber_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_SelectedImageGeometryPath_Key)); - results.push_back( - SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_CellDataAttributeMatrixPath_Key)); + results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NumNeighborsArrayPathKey, k_NumNeighborsPath_Key)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.hpp index 79717b03ae..2537b1ce07 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MinNeighborsFilter.hpp @@ -29,7 +29,6 @@ class SIMPLNXCORE_EXPORT MinNeighborsFilter : public IFilter static inline constexpr StringLiteral k_NumNeighborsPath_Key = "num_neighbors_path"; static inline constexpr StringLiteral k_MinNumNeighbors_Key = "min_num_neighbors"; static inline constexpr StringLiteral k_IgnoredVoxelArrays_Key = "ignored_voxel_arrays"; - static inline constexpr StringLiteral k_CellDataAttributeMatrixPath_Key = "cell_attribute_matrix_path"; /** * @brief Reads SIMPL json and converts it simplnx Arguments. diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp index f7d762623c..4762ceca83 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MoveDataFilter.cpp @@ -46,7 +46,7 @@ Parameters MoveDataFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SourceDataPaths_Key, "Data to Move", "The complete paths to the data object(s) to be moved", MultiPathSelectionParameter::ValueType{})); params.insert(std::make_unique(k_DestinationParentPath_Key, "New Parent", "The complete path to the parent data object to which the data will be moved", DataPath(), BaseGroup::GetAllGroupTypes())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp index 8385b6c40d..9153a23fad 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/MultiThresholdObjectsFilter.cpp @@ -408,7 +408,7 @@ Parameters MultiThresholdObjectsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ArrayThresholdsObject_Key, "Data Thresholds", "DataArray thresholds to mask", ArrayThresholdSet{}, ArrayThresholdsParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CreatedMaskType_Key, "Mask Type", "DataType used for the created Mask Array", DataType::boolean)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp index 81325ea861..949ab403d2 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/NearestPointFuseRegularGridsFilter.cpp @@ -57,18 +57,18 @@ Parameters NearestPointFuseRegularGridsFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_UseFill_Key, "Use Custom Fill Value", "If false all copied arrays will be filled with 0 by default", false)); params.insert(std::make_unique>(k_FillValue_Key, "Fill Value", "This is the value that will appear in the arrays outside the overlap", 0.0)); - params.insertSeparator(Parameters::Separator{"Required Sampling Data"}); + params.insertSeparator(Parameters::Separator{"Input Sampling Data"}); params.insert(std::make_unique(k_SamplingGeometryPath_Key, "Sampling Image Geometry", "This is the geometry that will be copied into the reference geometry at the overlap", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_SamplingCellAttributeMatrixPath_Key, "Sampling Cell Attribute Matrix", "The attribute matrix for the sampling geometry", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); - params.insertSeparator(Parameters::Separator{"Required Reference Data"}); + params.insertSeparator(Parameters::Separator{"Input Reference Data"}); params.insert(std::make_unique(k_ReferenceGeometryPath_Key, "Reference Image Geometry", "This is the geometry that will store the values from the overlap", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ReferenceCellAttributeMatrixPath_Key, "Reference Cell Attribute Matrix", "The attribute matrix for the reference geometry", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp index 2fb2d96800..55cef9b3ba 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PartitionGeometryFilter.cpp @@ -253,7 +253,7 @@ Parameters PartitionGeometryFilter::parameters() const params.insert(std::make_unique(k_InputGeometryCellAttributeMatrixPath_Key, "Input Geometry Cell Attribute Matrix ", "The attribute matrix that represents the cell data for the geometry.(Vertex=>Node Geometry, Cell=>Image/Rectilinear)", DataPath{})); - params.insertSeparator(Parameters::Separator{"Created Partition Grid Parameters"}); + params.insertSeparator(Parameters::Separator{"Output Partition Grid Parameters"}); params.insertLinkableParameter(std::make_unique(k_PartitioningMode_Key, "Select the partitioning mode", "Mode can be 'Basic (0)', 'Advanced (1)', 'Bounding Box (2)', 'Existing Partition Grid (3)'", 0, ::k_Choices)); params.insert(std::make_unique(k_StartingFeatureID_Key, "Starting Feature ID", "The value to start the partition grid's feature ids at.", 1)); @@ -280,18 +280,18 @@ Parameters PartitionGeometryFilter::parameters() const params.insert(std::make_unique(k_VertexMaskPath_Key, "Vertex Mask", "The complete path to the vertex mask array.", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Input Geometry Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Geometry Data Objects"}); params.insert(std::make_unique(k_FeatureAttrMatrixName_Key, "Feature Attribute Matrix", "The name of the feature attribute matrix that will be created as a child of the input geometry.", "Feature Data")); params.insert( std::make_unique(k_PartitionIdsArrayName_Key, "Partition Ids", "The name of the partition ids output array stored in the input cell attribute matrix", "Partition Ids")); - params.insertSeparator(Parameters::Separator{"Created Partition Grid Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Partition Grid Data Objects"}); params.insert(std::make_unique(k_PartitionGridGeometry_Key, "Partition Grid Geometry", "The complete path to the created partition grid geometry", DataPath({"Partition Grid Geometry"}))); params.insert(std::make_unique(k_PartitionGridCellAMName_Key, "Cell Attribute Matrix", "The name of the cell attribute matrix that will contain the partition grid's cell data arrays.", "Cell Data")); - params.insert(std::make_unique(k_PartitionGridFeatureIDsName_Key, "Feature Ids", + params.insert(std::make_unique(k_PartitionGridFeatureIDsName_Key, "Cell Feature Ids", "The name of the feature ids array that will contain the feature ids of the generated partition grid.", "Feature Ids")); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp index 2460d4a4c1..b48ead7f2c 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/PointSampleTriangleGeometryFilter.cpp @@ -56,35 +56,40 @@ Parameters PointSampleTriangleGeometryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + // Create the parameter descriptors that are needed for this filter + // params.insertLinkableParameter(std::make_unique(k_SamplesNumberType_Key, "Source for Number of Samples", "", 0, ChoicesParameter::Choices{"Manual", "Other Geometry"})); + params.insert(std::make_unique(k_NumberOfSamples_Key, "Number of Sample Points", "The number of sample points to use", 1000)); + // params.insert(std::make_unique(k_ParentGeometry_Key, "Source Geometry for Number of Sample Points", "", DataPath{}, true)); + + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); + params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", + DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); + + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "PointSampleTriangleGeometry SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - // Create the parameter descriptors that are needed for this filter - // params.insertLinkableParameter(std::make_unique(k_SamplesNumberType_Key, "Source for Number of Samples", "", 0, ChoicesParameter::Choices{"Manual", "Other Geometry"})); - params.insert(std::make_unique(k_NumberOfSamples_Key, "Number of Sample Points", "The number of sample points to use", 1000)); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); params.insert(std::make_unique(k_TriangleGeometry_Key, "Triangle Geometry to Sample", "The complete path to the triangle Geometry from which to sample", DataPath{})); - // params.insert(std::make_unique(k_ParentGeometry_Key, "Source Geometry for Number of Sample Points", "", DataPath{}, true)); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); - params.insertSeparator(Parameters::Separator{"Face Data"}); + + params.insertSeparator(Parameters::Separator{"Input Triangle Face Data"}); params.insert(std::make_unique(k_TriangleAreasArrayPath_Key, "Face Areas", "The complete path to the array specifying the area of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float64}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", - DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Face Attribute Arrays to Transfer", "The paths to the Face Attribute Arrays to transfer to the created Vertex Geometry where the mask is false, if Use Mask is checked", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Objects"}); - + params.insertSeparator(Parameters::Separator{"Output Vertex Geometry"}); // params.insert(std::make_unique(k_VertexParentGroup_Key, "Created Vertex Geometry Parent [Data Group]", "", DataPath{}, // DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::DataGroup})); params.insert(std::make_unique(k_VertexGeometryPath_Key, "Vertex Geometry Name", "The complete path to the DataGroup holding the Vertex Geometry that represents the sampling points", DataPath({"[Vertex Geometry]"}))); + params.insertSeparator(Parameters::Separator{"Output Vertex Attribute Matrix"}); params.insert( std::make_unique(k_VertexDataGroupName_Key, "Vertex Data", "The complete path to the vertex data arrays for the Vertex Geometry", INodeGeometry0D::k_VertexDataName)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp index 51f3c317e8..1a01d68859 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/QuickSurfaceMeshFilter.cpp @@ -58,36 +58,36 @@ Parameters QuickSurfaceMeshFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FixProblemVoxels_Key, "Attempt to Fix Problem Voxels", "See help page.", false)); params.insert(std::make_unique(k_GenerateTripleLines_Key, "Generate Triple Lines", "Experimental feature. May not work.", false)); - params.insertSeparator(Parameters::Separator{"Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GridGeometryDataPath_Key, "Grid Geometry", "The complete path to the Grid Geometry from which to create a Triangle Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image, IGeometry::Type::RectGrid})); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "The complete path to the Array specifying which Feature each Cell belongs to", DataPath{}, + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "The complete path to the Array specifying which Feature each Cell belongs to", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique( k_SelectedDataArrayPaths_Key, "Attribute Arrays to Transfer", "The paths to the Arrays specifying which Cell Attribute Arrays to transfer to the created Triangle Geometry", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Triangle Geometry"}); params.insert( std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); - params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Data"}); params.insert(std::make_unique(k_VertexDataGroupName_Key, "Vertex Data [AttributeMatrix]", "The complete path to the DataGroup where the Vertex Data of the Triangle Geometry will be created", INodeGeometry0D::k_VertexDataName)); - params.insert(std::make_unique(k_NodeTypesArrayName_Key, "NodeType", "The name of the Array specifying the type of node in the Triangle Geometry", "NodeTypes")); + params.insert(std::make_unique(k_NodeTypesArrayName_Key, "Node Type", "The name of the Array specifying the type of node in the Triangle Geometry", "NodeTypes")); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_FaceDataGroupName_Key, "Face Data [AttributeMatrix]", "The complete path to the DataGroup where the Face Data of the Triangle Geometry will be created", INodeGeometry2D::k_FaceDataName)); params.insert(std::make_unique(k_FaceLabelsArrayName_Key, "Face Labels", "The name of the Array specifying which Features are on either side of each Face in the Triangle Geometry", "FaceLabels")); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_FaceFeatureAttributeMatrixName_Key, "Face Feature Data [AttributeMatrix]", "The complete path to the DataGroup where the Feature Data will be stored.", INodeGeometry1D::k_FaceFeatureAttributeMatrix)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp index 1be8a3d3a9..5f1aaa7b97 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadBinaryCTNorthstarFilter.cpp @@ -367,7 +367,7 @@ Parameters ReadBinaryCTNorthstarFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputHeaderFile_Key, "Input Header File", "The path to the .nsihdr file", fs::path("DefaultInputFileName"), FileSystemPathParameter::ExtensionsType{".nsihdr"}, FileSystemPathParameter::PathType::InputFile)); params.insertLinkableParameter(std::make_unique(k_ImportSubvolume_Key, "Import Subvolume", "Import a subvolume instead of the entire volume", false)); @@ -378,7 +378,7 @@ Parameters ReadBinaryCTNorthstarFilter::parameters() const params.insert(std::make_unique(k_LengthUnit_Key, "Length Unit", "The length unit that will be set into the created image geometry", 0, IGeometry::GetAllLengthUnitStrings())); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert( std::make_unique(k_ImageGeometryPath_Key, "Image Geometry Path", "The path that will be used to create the Image Geometry.", DataPath{{"CT Image Geometry"}})); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix Name", "The name used to create the Cell Attribute Matrix.", "CT Scan Data")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp index f33f6fa851..7ff5977cc9 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadCSVFileFilter.cpp @@ -361,7 +361,7 @@ Parameters ReadCSVFileFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ReadCSVData_Key, "CSV Importer Data", "Holds all relevant csv file data collected from the custom interface", ReadCSVData())); @@ -369,13 +369,11 @@ Parameters ReadCSVFileFilter::parameters() const tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(1, "Value {}")); tableInfo.setRowsInfo(DynamicTableInfo::StaticVectorInfo({"Dim 0"})); - params.insertSeparator(Parameters::Separator{"Existing Attribute Matrix"}); + params.insertSeparator(Parameters::Separator{"Attribute Matrix Options"}); params.insertLinkableParameter( std::make_unique(k_UseExistingGroup_Key, "Use Existing Attribute Matrix", "Store the imported CSV data arrays in an existing attribute matrix.", false)); params.insert(std::make_unique(k_SelectedAttributeMatrixPath_Key, "Existing Attribute Matrix", "Store the imported CSV data arrays in this existing attribute matrix.", DataPath{})); - - params.insertSeparator(Parameters::Separator{"Created AttributeMatrix"}); params.insert(std::make_unique(k_CreatedDataGroup_Key, "New Attribute Matrix", "Store the imported CSV data arrays in a newly created attribute matrix.", DataPath{{"Imported Data"}})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp index 590e7c86f9..4075326d27 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDREAM3DFilter.cpp @@ -43,7 +43,7 @@ Uuid ReadDREAM3DFilter::uuid() const //------------------------------------------------------------------------------ std::string ReadDREAM3DFilter::humanName() const { - return "Read DREAM.3D File"; + return "Read DREAM3D-NX File"; } //------------------------------------------------------------------------------ @@ -56,7 +56,7 @@ std::vector ReadDREAM3DFilter::defaultTags() const Parameters ReadDREAM3DFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ImportFileData, "Import File Path", "The HDF5 file path the DataStructure should be imported from.", Dream3dImportParameter::ImportData())); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp index 2138459a20..0e40b891ed 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadDeformKeyFileV12Filter.cpp @@ -72,11 +72,11 @@ Parameters ReadDeformKeyFileV12Filter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFilePath_Key, "Input File", "File path that points to the imported file", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); - params.insertSeparator(Parameters::Separator{"Created Data Objects"}); + params.insertSeparator(Parameters::Separator{"Output Data Object(s)"}); params.insert(std::make_unique(k_QuadGeomPath_Key, "Quad Geometry", "The created Quad Geometry from imported from file", DataPath({"Quad Geometry"}))); params.insert(std::make_unique(k_VertexAMName_Key, "Vertex Data Name", "The name of the created Attribute Matrix for vertex data", "Vertex Data")); params.insert(std::make_unique(k_CellAMName_Key, "Cell Data Name", "The name of the created Attribute Matrix for cell data", "Cell Data")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp index 480c18431d..a9651b7c05 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadHDF5DatasetFilter.cpp @@ -135,7 +135,7 @@ Parameters ReadHDF5DatasetFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ImportHDF5File_Key, "Select HDF5 File", "The HDF5 file data to import", ReadHDF5DatasetParameter::ValueType{})); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp index 826effd149..3a3ac5c23b 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadRawBinaryFilter.cpp @@ -63,7 +63,7 @@ Parameters ReadRawBinaryFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "The input binary file path", fs::path(), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); params.insert(std::make_unique(k_ScalarType_Key, "Input Numeric Type", "Data type of the binary data", NumericType::int8)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp index 122a8e06e9..56ad8a8199 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadStlFileFilter.cpp @@ -61,7 +61,7 @@ Parameters ReadStlFileFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_ScaleOutput, "Scale Output Geometry", "Scale the output Triangle Geometry by the Scaling Factor", false)); params.insert(std::make_unique(k_ScaleFactor, "Scale Factor", "The factor by which to scale the geometry", 1.0F)); params.linkParameters(k_ScaleOutput, k_ScaleFactor, true); @@ -69,15 +69,15 @@ Parameters ReadStlFileFilter::parameters() const params.insert(std::make_unique(k_StlFilePath_Key, "STL File", "Input STL File", fs::path(""), FileSystemPathParameter::ExtensionsType{".stl"}, FileSystemPathParameter::PathType::InputFile)); - params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Triangle Geometry"}); params.insert( std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); - params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Data"}); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Vertex Data [AttributeMatrix]", "The name of the AttributeMatrix where the Vertex Data of the Triangle Geometry will be created", INodeGeometry0D::k_VertexDataName)); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_FaceAttributeMatrixName_Key, "Face Data [AttributeMatrix]", "The name of the AttributeMatrix where the Face Data of the Triangle Geometry will be created", INodeGeometry2D::k_FaceDataName)); params.insert(std::make_unique(k_FaceNormalsName_Key, "Face Labels", "The name of the triangle normals data array", "Face Normals")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp index 8085bc82b5..a50c64880f 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadTextDataArrayFilter.cpp @@ -53,7 +53,7 @@ Parameters ReadTextDataArrayFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input File", "File path that points to the imported file", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); params.insert(std::make_unique(k_ScalarType_Key, "Input Numeric Type", "Data Type to interpret and store data into.", NumericType::int8)); @@ -62,7 +62,7 @@ Parameters ReadTextDataArrayFilter::parameters() const params.insert(std::make_unique(k_DelimiterChoice_Key, "Delimiter", "Delimiter for values on a line", 0, ChoicesParameter::Choices{", (comma)", "; (semicolon)", " (space)", ": (colon)", "\\t (Tab)"})); - params.insertSeparator(Parameters::Separator{"Created DataArray"}); + params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_DataArrayPath_Key, "Created Array Path", "DataPath or Name for the underlying Data Array", DataPath{})); params.insert(std::make_unique(k_DataFormat_Key, "Data Format", "This value will specify which data format is used by the array's data store. An empty string results in in-memory data store.", "")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp index 87818d3566..12d564ea27 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -390,11 +390,13 @@ Parameters ReadVolumeGraphicsFileFilter::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Data"}); - params.insert(std::make_unique(k_VGHeaderFile_Key, "VolumeGraphics .vgi File", "The input VolumeGraphics file", fs::path("DefaultInputFileName"), + params.insert(std::make_unique(k_VGHeaderFile_Key, "Volume Graphics .vgi File", "The input VolumeGraphics file", fs::path("DefaultInputFileName"), FileSystemPathParameter::ExtensionsType{".vgi"}, FileSystemPathParameter::PathType::InputFile)); - params.insertSeparator(Parameters::Separator{"Created Data"}); + params.insertSeparator(Parameters::Separator{"Output Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Image Geometry", "Path to create the Image Geometry", DataPath({"VolumeGraphics"}))); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix", "The attribute matrix created as a child of the image geometry", "CT Data")); + params.insertSeparator(Parameters::Separator{"Output Data Array"}); params.insert(std::make_unique(k_DensityArrayName_Key, "Density", "The data array created as a child of the attribute matrix", "Density")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp index e96b8fdd11..76446c308e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReadVtkStructuredPointsFilter.cpp @@ -59,18 +59,18 @@ Parameters ReadVtkStructuredPointsFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_InputFile_Key, "Input VTK File", "The path to the input file", fs::path("data.vtk"), FileSystemPathParameter::ExtensionsType{".vtk"}, FileSystemPathParameter::PathType::InputFile)); params.insertLinkableParameter(std::make_unique(k_ReadPointData_Key, "Read Point Data", "Determines whether or not the Point Data will be read.", false)); params.insertLinkableParameter(std::make_unique(k_ReadCellData_Key, "Read Cell Data", "Determines whether or not the Cell Data will be read.", false)); - params.insertSeparator(Parameters::Separator{"Created Point Data"}); + params.insertSeparator(Parameters::Separator{"Output Point Data"}); params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Data Container [Point Data]", "The data container for the Point Data.", DataPath({"VTK Point Data"}))); params.insert(std::make_unique(k_VertexAttributeMatrixName_Key, "Attribute Matrix Name [Point Data]", "The attribute matrix for the Point Data.", "Vertex Data")); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Data Container [Cell Data]", "The data container for the Cell Data.", DataPath({"VTK Cell Data"}))); params.insert(std::make_unique(k_CellAttributeMatrixName_Key, "Attribute Matrix Name [Cell Data]", "The attribute matrix for the Cell Data.", "Cell Data")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp index eaefcf7dea..5cb8391328 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RegularGridSampleSurfaceMeshFilter.cpp @@ -56,7 +56,7 @@ Parameters RegularGridSampleSurfaceMeshFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Dimensions_Key, "Dimensions (Voxels)", "The dimensions of the created Image geometry", std::vector{128, 128, 128}, std::vector{"x", "y", "z"})); params.insert( @@ -66,16 +66,18 @@ Parameters RegularGridSampleSurfaceMeshFilter::parameters() const params.insert(std::make_unique(k_LengthUnit_Key, "Length Units (For Description Only)", "The units to be displayed below", to_underlying(IGeometry::LengthUnit::Micrometer), IGeometry::GetAllLengthUnitStrings())); - params.insertSeparator(Parameters::Separator{"Required Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The geometry to be sampled onto grid", DataPath{}, GeometrySelectionParameter::AllowedTypes{GeometrySelectionParameter::AllowedType ::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); - params.insertSeparator(Parameters::Separator{"Created Objects"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "The name and path for the image geometry to be created", DataPath{})); - params.insert(std::make_unique(k_CellAMName_Key, "Cell Data Name", "The name for the cell data Attribute Matrix within the Image geometry", "Cell Data")); - params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Feature Ids Name", "The name for the feature ids array in cell data Attribute Matrix", "Feature Ids")); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); + params.insert(std::make_unique(k_CellAMName_Key, "Cell Attribute Matrix", "The name for the cell data Attribute Matrix within the Image geometry", "Cell Data")); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); + params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Feature Ids", "The name for the feature ids array in cell data Attribute Matrix", "Feature Ids")); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp index 240299c6da..c43b5e1ed0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedFeaturesFilter.cpp @@ -61,7 +61,7 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter( std::make_unique(k_Functionality_Key, "Selected Operation", "Whether to [0] remove features, [1] extract features into new geometry or [2] extract and then remove", to_underlying(Functionality::Remove), ChoicesParameter::Choices{"Remove", "Extract", "Extract then Remove"})); // sequence dependent DO NOT REORDER @@ -71,14 +71,14 @@ Parameters RemoveFlaggedFeaturesFilter::parameters() const params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "Specifies to which Feature each cell belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CreatedImageGeometryPrefix_Key, "Created Image Geometry Prefix", "The prefix name for each of new cropped (extracted) geometry \n\nNOTE: a '-' will automatically be added between the prefix and number", "Extracted_Feature")); - params.insertSeparator(Parameters::Separator{"Required Input Feature Data"}); + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); 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", diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp index 3504997b41..ee2cd881f5 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedTrianglesFilter.cpp @@ -51,13 +51,13 @@ Parameters RemoveFlaggedTrianglesFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedTriangleGeometryPath_Key, "Triangle|Quad Geometry", "The Triangle|Quad Geometry that will be processed.", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle, IGeometry::Type::Quad})); params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask", "The DataArrayPath to the mask array that marks each face as either true (remove) or false(keep).", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Geometry"}); params.insert(std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Geometry", "The name of the created Triangle Geometry", DataPath({"ReducedGeometry"}))); return params; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp index 4b2c947d51..3cad8b388d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveFlaggedVerticesFilter.cpp @@ -89,12 +89,12 @@ Parameters RemoveFlaggedVerticesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedVertexGeometryPath_Key, "Vertex Geometry", "Path to the target Vertex Geometry", DataPath(), GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Vertex})); params.insert(std::make_unique(k_InputMaskPath_Key, "Flagged Vertex Array", "DataPath to the conditional array that will be used to decide which vertices are removed.", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Newly Reduced Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Geometry"}); params.insert(std::make_unique(k_CreatedVertexGeometryPath_Key, "Reduced Vertex Geometry", "Created Vertex Geometry DataPath. This will be created during the filter.", DataPath())); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp index d641c5067d..1eed1e79bc 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RemoveMinimumSizeFeaturesFilter.cpp @@ -289,22 +289,22 @@ Parameters RemoveMinimumSizeFeaturesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique>(k_MinAllowedFeaturesSize_Key, "Minimum Allowed Features Size", "Minimum allowed features size", 0)); params.insertLinkableParameter(std::make_unique(k_ApplySinglePhase_Key, "Apply to Single Phase", "Apply to Single Phase", false)); params.insert(std::make_unique>(k_PhaseNumber_Key, "Phase Index", "Target phase to remove", 0)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Input Image Geometry", "The input image geometry (cell)", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsPath_Key, "FeatureIds Array", "DataPath to FeatureIds DataArray", DataPath({"FeatureIds"}), + params.insert(std::make_unique(k_FeatureIdsPath_Key, "Cell Feature Ids", "DataPath to FeatureIds DataArray", DataPath({"FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Required Input Feature Data"}); - params.insert(std::make_unique(k_NumCellsPath_Key, "Num Cells Array", "DataPath to NumCells DataArray", DataPath({"NumElements"}), + params.insertSeparator(Parameters::Separator{"Input Feature Data"}); + params.insert(std::make_unique(k_NumCellsPath_Key, "Feature Num. Cells Array", "DataPath to NumCells DataArray", DataPath({"NumElements"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_FeaturePhasesPath_Key, "Phases Array", "DataPath to Feature Phases DataArray", DataPath{}, + params.insert(std::make_unique(k_FeaturePhasesPath_Key, "Feature Phases", "DataPath to Feature Phases DataArray", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); // Link the checkbox to the other parameters params.linkParameters(k_ApplySinglePhase_Key, k_PhaseNumber_Key, std::make_any(true)); @@ -447,7 +447,7 @@ Result<> RemoveMinimumSizeFeaturesFilter::executeImpl(DataStructure& dataStructu std::string message = fmt::format("Feature Count Changed: Previous: {} New: {}", currentFeatureCount, count); messageHandler(nx::core::IFilter::Message{nx::core::IFilter::Message::Type::Info, message}); - nx::core::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArrayRef, currentFeatureCount, messageHandler); + nx::core::RemoveInactiveObjects(dataStructure, cellFeatureGroupPath, activeObjects, featureIdsArrayRef, currentFeatureCount, messageHandler, shouldCancel); return {}; } diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp index c48d47edec..2d415e6d09 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RenameDataObjectFilter.cpp @@ -55,7 +55,7 @@ Parameters RenameDataObjectFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_AllowOverwrite_Key, "Allow Overwrite", "If true existing object with `New Name` and all of its nested objects will be removed to free up the name for the target DataObject", false)); params.insert(std::make_unique(k_SourceDataObjectPath_Key, "DataObject to Rename", "DataPath pointing to the target DataObject", DataPath())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp index fff06c9383..24e59d5158 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReplaceElementAttributesWithNeighborValuesFilter.cpp @@ -53,13 +53,13 @@ Parameters ReplaceElementAttributesWithNeighborValuesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_MinConfidence_Key, "Threshold Value", "The value to of the threshold", 0.1F)); params.insert(std::make_unique(k_SelectedComparison_Key, "Comparison Operator", "The operator to use for comparisons. 0=Less, 1=Greater Than", 0, ::k_OperationChoices)); params.insert(std::make_unique(k_Loop_Key, "Loop Until Gone", "The algorithm will keep looping until all pixels have been evaluated", false)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_ComparisonDataPath, "Input Comparison Array", "The DataPath to the input array to use for comparison", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp index ed886fd003..6c2f882957 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleImageGeomFilter.cpp @@ -79,7 +79,7 @@ Parameters ResampleImageGeomFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter( std::make_unique(k_ResamplingMode_Key, "Resampling Mode", "Mode can be [0] Spacing, [1] Scaling as Percent, [2] Exact Dimensions as voxels", k_SpacingModeIndex, ::k_Choices)); @@ -99,18 +99,18 @@ Parameters ResampleImageGeomFilter::parameters() const params.insertLinkableParameter(std::make_unique(k_RemoveOriginalGeometry_Key, "Perform In Place", "Removes the original Image Geometry after filter is completed", true)); - params.insertSeparator({"Input Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry to resample", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator(Parameters::Separator{"Renumber Features (Optional)"}); + params.insertSeparator(Parameters::Separator{"Optional Renumber Features"}); params.insertLinkableParameter(std::make_unique(k_RenumberFeatures_Key, "Renumber Features", "Specifies if the feature IDs should be renumbered", false)); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature IDs", "DataPath to Cell Feature IDs array", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert( - std::make_unique(k_FeatureAttributeMatrix_Key, "Cell Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", DataPath({"CellFeatureData"}))); + std::make_unique(k_FeatureAttributeMatrix_Key, "Feature Attribute Matrix", "DataPath to the feature Attribute Matrix", DataPath({"CellFeatureData"}))); - params.insertSeparator({"Created Image Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_CreatedImageGeometry_Key, "Created Image Geometry", "The location of the resampled geometry", DataPath())); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp index 2a626cb8b8..49432ed666 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ResampleRectGridToImageGeomFilter.cpp @@ -67,7 +67,7 @@ Parameters ResampleRectGridToImageGeomFilter::parameters() const params.insert(std::make_unique( k_SelectedDataArrayPaths_Key, "Attribute Arrays to Copy", "Rectilinear Grid Cell Data to possibly copy", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray, IArray::ArrayType::StringArray, IArray::ArrayType::NeighborListArray}, GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Output Image Geometry Parameters"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_Dimensions_Key, "Dimensions (Voxels)", "The image geometry voxel dimensions in which to re-sample the rectilinear grid geometry", std::vector{128, 128, 128}, std::vector{"x", "y", "z"})); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Created Image Geometry", "Path to the created Image Geometry", DataPath({"Image Geometry"}))); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp index 72b9c06a60..7af50ff6ab 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ReverseTriangleWindingFilter.cpp @@ -87,7 +87,7 @@ Parameters ReverseTriangleWindingFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Geometry"}); + params.insertSeparator(Parameters::Separator{"Input Triangle Geometry"}); params.insert(std::make_unique(k_TriGeomPath_Key, "Triangle Geometry", "The DataPath to then input Triangle Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp index 4e14221b42..0a7ae21c83 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RobustAutomaticThresholdFilter.cpp @@ -128,7 +128,7 @@ Parameters RobustAutomaticThresholdFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); // Input cannot be bool array params.insert(std::make_unique(k_InputArrayPath_Key, "Input Array", "DataArray to Threshold", DataPath(), nx::core::GetAllNumericTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp index f91da92fb5..beb6f61b25 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/RotateSampleRefFrameFilter.cpp @@ -325,7 +325,7 @@ Parameters RotateSampleRefFrameFilter::parameters() const { Parameters params; - params.insertSeparator({"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_RotateSliceBySlice_Key, "Perform Slice By Slice Transform", "This option is specific to EBSD Data and is not generally used.", false)); params.insertLinkableParameter(std::make_unique(k_RotationRepresentation_Key, "Rotation Representation", "Which form used to represent rotation (axis angle or rotation matrix)", @@ -343,11 +343,11 @@ Parameters RotateSampleRefFrameFilter::parameters() const params.linkParameters(k_RotationRepresentation_Key, k_RotationAxisAngle_Key, std::make_any(to_underlying(RotationRepresentation::AxisAngle))); params.linkParameters(k_RotationRepresentation_Key, k_RotationMatrix_Key, std::make_any(to_underlying(RotationRepresentation::RotationMatrix))); - params.insertSeparator({"Input Geometry and Data"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Selected Image Geometry", "The target geometry on which to perform the rotation", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insertSeparator({"Output Geometry and Data"}); + params.insertSeparator(Parameters::Separator{"Output Geometry and Data"}); params.insert(std::make_unique(k_CreatedImageGeometryPath_Key, "Created Image Geometry", "The location of the rotated geometry", DataPath{})); params.linkParameters(k_RemoveOriginalGeometry_Key, k_CreatedImageGeometryPath_Key, false); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp index 650b39d87c..a0192e7fd3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ScalarSegmentFeaturesFilter.cpp @@ -67,25 +67,27 @@ Parameters ScalarSegmentFeaturesFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Segmentation Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique>(k_ScalarToleranceKey, "Scalar Tolerance", "Tolerance for segmenting input Cell Data", 1)); params.insert(std::make_unique(k_RandomizeFeatures_Key, "Randomize Feature IDs", "Specifies if feature IDs should be randomized during calculations", false)); + + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Determines if a mask array is used for segmenting", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "Path to the DataArray Mask", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, + params.insert(std::make_unique(k_MaskArrayPath_Key, "Cell Mask Array", "Path to the DataArray Mask", DataPath(), ArraySelectionParameter::AllowedTypes{DataType::boolean}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.linkParameters(k_UseMask_Key, k_MaskArrayPath_Key, std::make_any(true)); - params.insertSeparator(Parameters::Separator{"Required Input Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GridGeomPath_Key, "Input Image Geometry", "DataPath to input Image Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); params.insert(std::make_unique(k_InputArrayPathKey, "Scalar Array to Segment", "Path to the DataArray to segment", DataPath(), nx::core::GetIntegerDataTypes(), ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insertSeparator(Parameters::Separator{"Created Cell Data"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_FeatureIdsName_Key, "Cell Feature IDs", "Path to the created Feature IDs path", "FeatureIds")); - params.insertSeparator(Parameters::Separator{"Created Cell Feature Data"}); - params.insert(std::make_unique(k_CellFeatureName_Key, "Cell Feature Attribute Matrix", "Created Cell Feature Attribute Matrix", "CellFeatureData")); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); + params.insert(std::make_unique(k_CellFeatureName_Key, "Feature Attribute Matrix", "Created Cell Feature Attribute Matrix", "CellFeatureData")); params.insert(std::make_unique(k_ActiveArrayName_Key, "Active", "Created array", "Active")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp index 2b98b58f48..f824e1ce4e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SetImageGeomOriginScalingFilter.cpp @@ -51,12 +51,12 @@ Parameters SetImageGeomOriginScalingFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_SelectedImageGeometryPath_Key, "Image Geometry", "Path to the target ImageGeom", DataPath(), std::set{IGeometry::Type::Image})); params.insertLinkableParameter(std::make_unique(k_ChangeOrigin_Key, "Set Origin", "Specifies if the origin should be changed", true)); params.insert( std::make_unique(k_CenterOrigin_Key, "Put Input Origin at the Center of Geometry", "Specifies if the origin should be aligned with the corner (false) or center (true)", false)); - params.insert(std::make_unique(k_Origin_Key, "Origin (Physical Units)", "Specifies the new origin values in physical units.", std::vector{0.0, 0.0, 0.0}, + params.insert(std::make_unique(k_Origin_Key, "Origin (Physical Units)", "Specifies the new origin values in physical units.", std::vector{0.0, 0.0, 0.0}, std::vector{"X", "Y", "Z"})); params.insertLinkableParameter(std::make_unique(k_ChangeSpacing_Key, "Set Spacing", "Specifies if the spacing should be changed", true)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp index 6baa9a0133..34160f32ac 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SharedFeatureFaceFilter.cpp @@ -49,19 +49,19 @@ Parameters SharedFeatureFaceFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_RandomizeFeatures_Key, "Randomize Face IDs", "Specifies if feature IDs should be randomized. Can be helpful when visualizing the faces.", false)); - params.insertSeparator(Parameters::Separator{"Required Input Data"}); + params.insertSeparator(Parameters::Separator{"Input Data"}); params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_FaceLabelsArrayPath_Key, "Face Labels", "The DataPath to the FaceLabels values.", DataPath{}, ArraySelectionParameter::AllowedTypes{nx::core::DataType::int32})); - params.insertSeparator(Parameters::Separator{"Created Face Data Arrays"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_FeatureFaceIdsArrayName_Key, "Feature Face Ids", "The name of the calculated Feature Face Ids DataArray", "SharedFeatureFaceId")); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Feature Data"}); params.insert(std::make_unique(k_GrainBoundaryAttributeMatrixName_Key, "Face Feature Attribute Matrix", "The name of the AttributeMatrix that holds the **Feature Face** data", "SharedFeatureFace")); params.insert( diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp index 5d289b2448..3f65c316b8 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SilhouetteFilter.cpp @@ -61,23 +61,23 @@ Parameters SilhouetteFilter::parameters() const { Parameters params; - // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Optional Parameters"}); - params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask", "Specifies whether or not to use a mask array", false)); - params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", - DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean})); - - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert( std::make_unique(k_DistanceMetric_Key, "Distance Metric", "Distance Metric type to be used for calculations", to_underlying(KUtilities::DistanceMetric::Euclidean), ChoicesParameter::Choices{"Euclidean", "Squared Euclidean", "Manhattan", "Cosine", "Pearson", "Squared Pearson"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Objects"}); + // Create the parameter descriptors that are needed for this filter + params.insertSeparator(Parameters::Separator{"Optional Data Mask"}); + params.insertLinkableParameter(std::make_unique(k_UseMask_Key, "Use Mask Array", "Specifies whether or not to use a mask array", false)); + params.insert(std::make_unique(k_MaskArrayPath_Key, "Mask Array", "DataPath to the boolean mask array. Values that are true will mark that cell/point as usable.", + DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::boolean})); + + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_SelectedArrayPath_Key, "Attribute Array to Silhouette", "The DataPath to the input DataArray", DataPath{}, nx::core::GetAllNumericTypes())); params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cluster Ids", "The DataPath to the DataArray that specifies which cluster each point belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32})); - params.insertSeparator(Parameters::Separator{"Created Objects"}); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_SilhouetteArrayPath_Key, "Silhouette", "The DataPath to the calculated output Silhouette array values", DataPath{})); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp index 5a36606f5c..0e87450b53 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SplitAttributeArrayFilter.cpp @@ -54,8 +54,8 @@ Parameters SplitAttributeArrayFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_MultiCompArrayPath_Key, "Multicomponent Attribute Array", "The multicomponent Attribute Array to split", DataPath{}, GetAllDataTypes())); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); + params.insert(std::make_unique(k_MultiCompArrayPath_Key, "Multi-Component Attribute Array", "The multicomponent Attribute Array to split", DataPath{}, GetAllDataTypes())); params.insert(std::make_unique(k_Postfix_Key, "Postfix", "Postfix to add to the end of the split Attribute Arrays", "_Component")); params.insert(std::make_unique(k_DeleteOriginal_Key, "Remove Original Array", "Whether or not to remove the original multicomponent array after splitting", false)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp index 2832869343..78b98dab8d 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/SurfaceNetsFilter.cpp @@ -58,39 +58,38 @@ std::vector SurfaceNetsFilter::defaultTags() const Parameters SurfaceNetsFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_ApplySmoothing_Key, "Apply smoothing operations", "Use the built in smmothing operation.", false)); - params.insertSeparator(Parameters::Separator{"Smoothing Values"}); params.insert(std::make_unique(k_SmoothingIterations_Key, "Relaxation Iterations", "Number of relaxation iterations to perform. More iterations causes more smoothing.", 20)); params.insert( std::make_unique(k_MaxDistanceFromVoxelCenter_Key, "Max Distance from Voxel Center", "The maximum allowable distance that a node can move from the voxel center", 1.0F)); params.insert(std::make_unique(k_RelaxationFactor_Key, "Relaxation Factor", "The factor used to determine how far a node can move in each smoothing iteration", 0.5F)); - params.insertSeparator(Parameters::Separator{"Required Cell Data"}); + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); params.insert(std::make_unique(k_GridGeometryDataPath_Key, "Input Image Geometry", "DataPath to input Image Geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "The complete path to the Array specifying which Feature each Cell belongs to", DataPath{}, + params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Cell Feature Ids", "The complete path to the Array specifying which Feature each Cell belongs to", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique( k_SelectedDataArrayPaths_Key, "Attribute Arrays to Transfer", "The paths to the Arrays specifying which Cell Attribute Arrays to transfer to the created Triangle Geometry", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Triangle Geometry"}); + params.insertSeparator(Parameters::Separator{"Output Triangle Geometry"}); params.insert( std::make_unique(k_CreatedTriangleGeometryPath_Key, "Created Triangle Geometry", "The name of the created Triangle Geometry", DataPath({"TriangleDataContainer"}))); - params.insertSeparator(Parameters::Separator{"Created Vertex Data"}); + params.insertSeparator(Parameters::Separator{"Output Vertex Data"}); params.insert(std::make_unique(k_VertexDataGroupName_Key, "Vertex Data [AttributeMatrix]", "The complete path to the DataGroup where the Vertex Data of the Triangle Geometry will be created", INodeGeometry0D::k_VertexDataName)); - params.insert(std::make_unique(k_NodeTypesArrayName_Key, "NodeType", "The complete path to the Array specifying the type of node in the Triangle Geometry", "NodeTypes")); + params.insert(std::make_unique(k_NodeTypesArrayName_Key, "Node Type", "The complete path to the Array specifying the type of node in the Triangle Geometry", "NodeTypes")); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_FaceDataGroupName_Key, "Face Data [AttributeMatrix]", "The complete path to the DataGroup where the Face Data of the Triangle Geometry will be created", INodeGeometry2D::k_FaceDataName)); params.insert(std::make_unique(k_FaceLabelsArrayName_Key, "Face Labels", "The complete path to the Array specifying which Features are on either side of each Face in the Triangle Geometry", "FaceLabels")); - params.insertSeparator(Parameters::Separator{"Created Face Feature Data"}); + params.insertSeparator(Parameters::Separator{"Output Feature Data"}); params.insert(std::make_unique(k_FaceFeatureAttributeMatrixName_Key, "Face Feature Data [AttributeMatrix]", "The complete path to the DataGroup where the Feature Data will be stored.", INodeGeometry1D::k_FaceFeatureAttributeMatrix)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp index a55a54cad4..b3c86d958a 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleCentroidFilter.cpp @@ -56,10 +56,10 @@ Parameters TriangleCentroidFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_CentroidsArrayName_Key, "Created Face Centroids", "The complete path to the array storing the calculated centroids", "Centroids")); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp index 184b3b9486..181ff810a0 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleDihedralAngleFilter.cpp @@ -142,10 +142,10 @@ Parameters TriangleDihedralAngleFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the dihedral angles", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert(std::make_unique(k_SurfaceMeshTriangleDihedralAnglesArrayName_Key, "Created Dihedral Angles", "The name of the array storing the calculated dihedral angles", "Dihedral Angles")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp index 79e5c02b06..4c0016f919 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/TriangleNormalFilter.cpp @@ -108,10 +108,10 @@ Parameters TriangleNormalFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriGeometryDataPath_Key, "Triangle Geometry", "The complete path to the Geometry for which to calculate the normals", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); - params.insertSeparator(Parameters::Separator{"Created Face Data"}); + params.insertSeparator(Parameters::Separator{"Output Face Data"}); params.insert( std::make_unique(k_SurfaceMeshTriangleNormalsArrayName_Key, "Created Face Normals", "The complete path to the array storing the calculated normals", "Face Normals")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp index db64f0ac0e..adf62a611e 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.cpp @@ -58,13 +58,13 @@ Parameters UncertainRegularGridSampleSurfaceMeshFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Seeded Randomness"}); + params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"}); params.insertLinkableParameter(std::make_unique(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", 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", "UncertainRegularGridSampleSurfaceMesh SeedValue")); - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Dimensions_Key, "Number of Cells per Axis", "The dimensions of the created Image geometry", std::vector{128, 128, 128}, std::vector{"X Points", "Y Points", "Z Points"})); params.insert( @@ -74,15 +74,17 @@ Parameters UncertainRegularGridSampleSurfaceMeshFilter::parameters() const params.insert(std::make_unique(k_Uncertainty_Key, "Uncertainty", "uncertainty values associated with X, Y and Z positions of Cells", std::vector{0.1F, 0.1F, 0.1F}, std::vector{"x", "y", "z"})); - params.insertSeparator(Parameters::Separator{"Required Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriangleGeometryPath_Key, "Triangle Geometry", "The geometry to be sampled onto grid", DataPath{}, GeometrySelectionParameter::AllowedTypes{GeometrySelectionParameter::AllowedType ::Triangle})); params.insert(std::make_unique(k_SurfaceMeshFaceLabelsArrayPath_Key, "Face Labels", "Array specifying which Features are on either side of each Face", DataPath{}, nx::core::GetAllDataTypes())); - params.insertSeparator(Parameters::Separator{"Created Objects"}); + params.insertSeparator(Parameters::Separator{"Output Image Geometry"}); params.insert(std::make_unique(k_ImageGeomPath_Key, "Image Geometry", "The name and path for the image geometry to be created", DataPath{})); + params.insertSeparator(Parameters::Separator{"Output Cell Attribute Matrix"}); params.insert(std::make_unique(k_CellAMName_Key, "Cell Data Name", "The name for the cell data Attribute Matrix within the Image geometry", "Cell Data")); + params.insertSeparator(Parameters::Separator{"Output Cell Data"}); params.insert(std::make_unique(k_FeatureIdsArrayName_Key, "Feature Ids Name", "The name for the feature ids array in cell data Attribute Matrix", "Feature Ids")); // Associate the Linkable Parameter(s) to the children parameters that they control diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp index 133cb99b7f..b70f51d216 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteASCIIDataFilter.cpp @@ -65,7 +65,7 @@ Parameters WriteASCIIDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_OutputStyle_Key, "Output File Generation", "Whether to output a folder of files or a single file with all the data in column form", to_underlying(OutputStyle::SingleFile), ChoicesParameter::Choices{"Multiple Files", "Single File"})); // sequence dependent DO NOT REORDER @@ -79,7 +79,7 @@ Parameters WriteASCIIDataFilter::parameters() const ChoicesParameter::Choices{"Space", "Semicolon", "Comma", "Colon", "Tab"})); // sequence dependent DO NOT REORDER params.insert(std::make_unique(k_Includes_Key, "Header and Index Options", "Default Include is Headers only", to_underlying(Includes::Headers), ChoicesParameter::Choices{"Neither", "Headers", "Index", "Both"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Attribute Arrays to Export", "Data Arrays to be written to disk", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray, IArray::ArrayType::StringArray}, nx::core::GetAllDataTypes())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp index d1b864eddd..f224f6eec3 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAbaqusHexahedronFilter.cpp @@ -54,15 +54,18 @@ Parameters WriteAbaqusHexahedronFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_HourglassStiffness_Key, "Hourglass Stiffness Value", "The value to use for the Hourglass Stiffness", 250)); params.insert(std::make_unique(k_JobName_Key, "Job Name", "The name of the job", "SomeString")); params.insert(std::make_unique(k_OutputPath_Key, "Output Path", "The output file path", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputDir, true)); params.insert(std::make_unique(k_FilePrefix_Key, "Output File Prefix", "The prefix to use for each output file.", "SomeString")); - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Image Geometry"}); params.insert(std::make_unique(k_ImageGeometryPath_Key, "Selected Image Geometry", "The input Image Geometry that will be written.", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Cell Data"}); + + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index 05541ab095..a0483ba383 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -56,13 +56,13 @@ Parameters WriteAvizoRectilinearCoordinateFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File", "Amira Mesh .am file created", fs::path("Data/Output/AvizoRectilinear.am"), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); params.insert(std::make_unique(k_WriteBinaryFile_Key, "Write Binary File", "Whether or not to write the output file as binary", false)); params.insert(std::make_unique(k_GeometryPath_Key, "Image Geometry", "The path to the input image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_Units_Key, "Units", "The units of the data", "microns")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index 8fddaa57b2..0bb515b589 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -56,13 +56,13 @@ Parameters WriteAvizoUniformCoordinateFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File", "Amira Mesh .am file created", fs::path("Data/Output/AvizoUniform.am"), FileSystemPathParameter::ExtensionsType{".am"}, FileSystemPathParameter::PathType::OutputFile)); params.insert(std::make_unique(k_WriteBinaryFile_Key, "Write Binary File", "Whether or not to write the output file as binary", false)); params.insert(std::make_unique(k_GeometryPath_Key, "Image Geometry", "The path to the input image geometry", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_Units_Key, "Units", "The units of the data", "microns")); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp index 2da4f24771..243356a3f6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteBinaryDataFilter.cpp @@ -72,13 +72,13 @@ Parameters WriteBinaryDataFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_Endianess_Key, "Endianess", "Default is little endian", to_underlying(Endianess::Little), ChoicesParameter::Choices{"Little Endian", "Big Endian"})); // sequence dependent DO NOT REORDER params.insert(std::make_unique(k_OutputPath_Key, "Output Path", "The output file path", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputDir, true)); params.insert(std::make_unique(k_FileExtension_Key, "File Extension", "The file extension for the output file", ".bin")); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_SelectedDataArrayPaths_Key, "Attribute Arrays to Export", "The arrays to be exported to a binary file", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::DataArray}, nx::core::GetAllDataTypes())); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp index 64d00ec1e6..d514eebbfb 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteDREAM3DFilter.cpp @@ -56,7 +56,7 @@ Parameters WriteDREAM3DFilter::parameters() const { Parameters params; - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_ExportFilePath, "Output File Path", "The file path the DataStructure should be written to as an HDF5 file.", "Untitled.dream3d", FileSystemPathParameter::ExtensionsType{".dream3d"}, FileSystemPathParameter::PathType::OutputFile, false)); params.insert(std::make_unique(k_WriteXdmf, "Write Xdmf File", "Whether or not to write the data out an XDMF file", true)); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp index 8550f621da..5d77970351 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -58,14 +58,14 @@ Parameters WriteFeatureDataCSVFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_FeatureDataFile_Key, "Output File", "Path to the output file to write.", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); params.insert(std::make_unique(k_WriteNeighborListData_Key, "Write Neighbor Data", "Should the neighbor list data be written to the file", true)); params.insert(std::make_unique(k_WriteNumFeaturesLine_Key, "Write Number of Features Line", "Should the number of features be written to the file.", true)); params.insert(std::make_unique(k_DelimiterChoiceInt_Key, "Delimiter", "Default Delimiter is Comma", to_underlying(OStreamUtilities::Delimiter::Comma), ChoicesParameter::Choices{"Space", "Semicolon", "Comma", "Colon", "Tab"})); // sequence dependent DO NOT REORDER - params.insertSeparator(Parameters::Separator{"Required Input Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_CellFeatureAttributeMatrixPath_Key, "Feature Attribute Matrix", "Input Feature Attribute Matrix", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::AttributeMatrix})); diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp index 19e04c2573..87a7e732e6 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteLosAlamosFFTFilter.cpp @@ -54,19 +54,19 @@ Parameters WriteLosAlamosFFTFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insert(std::make_unique(k_OutputFile_Key, "Output File Path", "The path to the output file", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); - params.insert(std::make_unique(k_ImageGeomPath, "Parent Image Geometry", "The parent image geometry holding the subsequent arrays", DataPath{}, + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); + params.insert(std::make_unique(k_ImageGeomPath, "Input Image Geometry", "The image geometry holding the arrays to write", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Image})); - params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, + params.insert(std::make_unique(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); - params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Euler Angles", + params.insert(std::make_unique(k_CellEulerAnglesArrayPath_Key, "Cell Euler Angles", "Data Array containing the three angles defining the orientation for each of the Cell in Bunge convention (Z-X-Z)", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::float32}, ArraySelectionParameter::AllowedComponentShapes{{3}})); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Feature Phases", "Data Array that specifies to which Ensemble each Cell belongs", DataPath{}, + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Data Array that specifies to which Ensemble each Cell belongs", DataPath{}, ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); return params; diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp index 6e73eb4542..7d6a88f036 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/WriteStlFileFilter.cpp @@ -56,7 +56,7 @@ Parameters WriteStlFileFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter - params.insertSeparator(Parameters::Separator{"Input Parameters"}); + params.insertSeparator(Parameters::Separator{"Input Parameter(s)"}); params.insertLinkableParameter(std::make_unique(k_GroupingType_Key, "File Grouping Type", "How to partition the stl files", to_underlying(GroupingType::Features), ChoicesParameter::Choices{"Features", "Phases and Features", "None [Single File]"})); // sequence dependent DO NOT REORDER params.insert(std::make_unique(k_OutputStlDirectory_Key, "Output STL Directory", "Directory to dump the STL file(s) to", fs::path(), @@ -67,7 +67,7 @@ Parameters WriteStlFileFilter::parameters() const params.insert(std::make_unique(k_OutputStlFile_Key, "Output STL File", "STL File to dump the Triangle Geometry to", fs::path(), FileSystemPathParameter::ExtensionsType{".stl"}, FileSystemPathParameter::PathType::OutputFile, false)); - params.insertSeparator(Parameters::Separator{"Required Data Objects"}); + params.insertSeparator(Parameters::Separator{"Input Data Objects"}); params.insert(std::make_unique(k_TriangleGeomPath_Key, "Selected Triangle Geometry", "The geometry to print", DataPath{}, GeometrySelectionParameter::AllowedTypes{IGeometry::Type::Triangle})); params.insert(std::make_unique(k_FeatureIdsPath_Key, "Face labels", "The triangle feature ids array to order/index files by", DataPath{}, diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp index 97f0db619a..ae9aa52d18 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp @@ -51,7 +51,7 @@ #include "SimplnxCore/Filters/FindFeaturePhasesBinaryFilter.hpp" #include "SimplnxCore/Filters/FindNeighborhoodsFilter.hpp" #include "SimplnxCore/Filters/FindNeighborListStatisticsFilter.hpp" -#include "SimplnxCore/Filters/FindNeighborsFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp" #include "SimplnxCore/Filters/FindNumFeaturesFilter.hpp" #include "SimplnxCore/Filters/FindSurfaceAreaToVolumeFilter.hpp" #include "SimplnxCore/Filters/FindSurfaceFeaturesFilter.hpp" @@ -166,7 +166,7 @@ namespace nx::core {nx::core::Uuid::FromString("64d20c7b-697c-5ff1-9d1d-8a27b071f363").value(), {nx::core::FilterTraits::uuid, &FindFeaturePhasesBinaryFilter::FromSIMPLJson}}, // FindFeaturePhasesBinary {nx::core::Uuid::FromString("697ed3de-db33-5dd1-a64b-04fb71e7d63e").value(), {nx::core::FilterTraits::uuid, &FindNeighborhoodsFilter::FromSIMPLJson}}, // FindNeighborhoods {nx::core::Uuid::FromString("73ee33b6-7622-5004-8b88-4d145514fb6a").value(), {nx::core::FilterTraits::uuid, &FindNeighborListStatisticsFilter::FromSIMPLJson}}, // FindNeighborListStatisticsFilter - {nx::core::Uuid::FromString("97cf66f8-7a9b-5ec2-83eb-f8c4c8a17bac").value(), {nx::core::FilterTraits::uuid, &FindNeighborsFilter::FromSIMPLJson}}, // FindNeighborsFilter + {nx::core::Uuid::FromString("97cf66f8-7a9b-5ec2-83eb-f8c4c8a17bac").value(), {nx::core::FilterTraits::uuid, &FindFeatureNeighborsFilter::FromSIMPLJson}}, // FindNeighborsFilter {nx::core::Uuid::FromString("529743cf-d5d5-5d5a-a79f-95c84a5ddbb5").value(), {nx::core::FilterTraits::uuid, &FindNumFeaturesFilter::FromSIMPLJson}}, // FindNumFeatures {nx::core::Uuid::FromString("5d586366-6b59-566e-8de1-57aa9ae8a91c").value(), {nx::core::FilterTraits::uuid, &FindSurfaceAreaToVolumeFilter::FromSIMPLJson}}, // FindSurfaceAreaToVolume {nx::core::Uuid::FromString("d2b0ae3d-686a-5dc0-a844-66bc0dc8f3cb").value(), {nx::core::FilterTraits::uuid, &FindSurfaceFeaturesFilter::FromSIMPLJson}}, // FindSurfaceFeaturesFilter diff --git a/src/Plugins/SimplnxCore/test/CMakeLists.txt b/src/Plugins/SimplnxCore/test/CMakeLists.txt index 75b7e7050d..7487d417e7 100644 --- a/src/Plugins/SimplnxCore/test/CMakeLists.txt +++ b/src/Plugins/SimplnxCore/test/CMakeLists.txt @@ -60,7 +60,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS FindLargestCrossSectionsTest.cpp FindNeighborhoodsTest.cpp FindNeighborListStatisticsTest.cpp - FindNeighborsTest.cpp + FindFeatureNeighborsTest.cpp FindNumFeaturesTest.cpp FindSurfaceAreaToVolumeTest.cpp FindSurfaceFeaturesTest.cpp @@ -242,14 +242,14 @@ include(${simplnx_SOURCE_DIR}/cmake/Utility.cmake) set(PREBUILT_PIPELINE_NAMES # Example or other test pipelines - # Currently Broken; Waiting on another PR. https://github.com/bluequartzsoftware/simplnx/pull/472 - # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Demo.d3dpipeline" - # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Image.d3dpipeline" - # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Node.d3dpipeline" + + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Demo.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Image.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ApplyTransformation_Node.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ArrayCalculatorExample.d3dpipeline" # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ExecuteProcess.d3dpipeline" - "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Import_CSV_Data.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Import_CSV_File.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Import_STL_Model.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Triangle_Face_Data_Demo.d3dpipeline" "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Remove_Triangles.d3dpipeline" @@ -260,7 +260,7 @@ set(PREBUILT_PIPELINE_NAMES # These depend on files that are output from OrientationAnalysis Plugin # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/FindBiasedFeatures.d3dpipeline" # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/FindBoundaryCells.d3dpipeline" - # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Import_ASCII.d3dpipeline" + "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/Import_Text_Data.d3dpipeline" # "${${PLUGIN_NAME}_SOURCE_DIR}/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline" ) diff --git a/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/FindFeatureNeighborsTest.cpp similarity index 67% rename from src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp rename to src/Plugins/SimplnxCore/test/FindFeatureNeighborsTest.cpp index 589f45392c..5a6407a195 100644 --- a/src/Plugins/SimplnxCore/test/FindNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/FindFeatureNeighborsTest.cpp @@ -1,4 +1,4 @@ -#include "SimplnxCore/Filters/FindNeighborsFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp" #include "SimplnxCore/SimplnxCore_test_dirs.hpp" #include "simplnx/UnitTest/UnitTestCommon.hpp" @@ -10,7 +10,7 @@ using namespace nx::core; using namespace nx::core::Constants; using namespace nx::core::UnitTest; -TEST_CASE("SimplnxCore::FindNeighborsFilter", "[SimplnxCore][FindNeighborsFilter]") +TEST_CASE("SimplnxCore::FindFeatureNeighborsFilter", "[SimplnxCore][FindFeatureNeighborsFilter]") { const nx::core::UnitTest::TestFileSentinel testDataSentinel(nx::core::unit_test::k_CMakeExecutable, nx::core::unit_test::k_TestFilesDir, "6_6_stats_test.tar.gz", "6_6_stats_test.dream3d"); // Read the Small IN100 Data set @@ -28,22 +28,22 @@ TEST_CASE("SimplnxCore::FindNeighborsFilter", "[SimplnxCore][FindNeighborsFilter std::string surfaceFeaturesName = "SurfaceFeatures_computed"; { - FindNeighborsFilter filter; + FindFeatureNeighborsFilter filter; Arguments args; - args.insertOrAssign(FindNeighborsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(FindNeighborsFilter::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); - args.insertOrAssign(FindNeighborsFilter::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); - args.insertOrAssign(FindNeighborsFilter::k_StoreBoundary_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborsFilter::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_StoreBoundary_Key, std::make_any(true)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); - args.insertOrAssign(FindNeighborsFilter::k_StoreSurface_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborsFilter::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_StoreSurface_Key, std::make_any(true)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); - args.insertOrAssign(FindNeighborsFilter::k_NumNeighborsName_Key, std::make_any(numNeighborName)); - args.insertOrAssign(FindNeighborsFilter::k_NeighborListName_Key, std::make_any(neighborListName)); - args.insertOrAssign(FindNeighborsFilter::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_NumNeighborsName_Key, std::make_any(numNeighborName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_NeighborListName_Key, std::make_any(neighborListName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp index 45cfa12444..69a9eb70e7 100644 --- a/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp +++ b/src/Plugins/SimplnxCore/test/LaplacianSmoothingFilterTest.cpp @@ -109,9 +109,11 @@ TEST_CASE("SimplnxCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm REQUIRE(executeResult.result.valid()); } +#ifdef SIMPLNX_WRITE_TEST_OUTPUT Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/LaplacianSmoothing.dream3d", unit_test::k_BinaryTestOutputDir)); nx::core::HDF5::FileWriter fileWriter = std::move(result.value()); auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); SIMPLNX_RESULT_REQUIRE_VALID(resultH5); +#endif } diff --git a/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp index 871ca7feca..dcd9942fe6 100644 --- a/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp +++ b/src/Plugins/SimplnxCore/test/MinNeighborsTest.cpp @@ -1,4 +1,4 @@ -#include "SimplnxCore/Filters/FindNeighborsFilter.hpp" +#include "SimplnxCore/Filters/FindFeatureNeighborsFilter.hpp" #include "SimplnxCore/Filters/MinNeighborsFilter.hpp" #include "SimplnxCore/SimplnxCore_test_dirs.hpp" @@ -70,22 +70,22 @@ TEST_CASE("SimplnxCore::MinNeighborsFilter", "[SimplnxCore][MinNeighborsFilter]" DataPath surfaceFeaturesPath = cellFeatureAttributeMatrixPath.createChildPath(surfaceFeaturesName); { - FindNeighborsFilter filter; + FindFeatureNeighborsFilter filter; Arguments args; - args.insertOrAssign(FindNeighborsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(FindNeighborsFilter::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); - args.insertOrAssign(FindNeighborsFilter::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_CellFeaturesPath_Key, std::make_any(cellFeatureAttributeMatrixPath)); - args.insertOrAssign(FindNeighborsFilter::k_StoreBoundary_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborsFilter::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_StoreBoundary_Key, std::make_any(true)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_BoundaryCellsName_Key, std::make_any(boundaryCellsName)); - args.insertOrAssign(FindNeighborsFilter::k_StoreSurface_Key, std::make_any(true)); - args.insertOrAssign(FindNeighborsFilter::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_StoreSurface_Key, std::make_any(true)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SurfaceFeaturesName_Key, std::make_any(surfaceFeaturesName)); - args.insertOrAssign(FindNeighborsFilter::k_NumNeighborsName_Key, std::make_any(numNeighborName)); - args.insertOrAssign(FindNeighborsFilter::k_NeighborListName_Key, std::make_any(neighborListName)); - args.insertOrAssign(FindNeighborsFilter::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_NumNeighborsName_Key, std::make_any(numNeighborName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_NeighborListName_Key, std::make_any(neighborListName)); + args.insertOrAssign(FindFeatureNeighborsFilter::k_SharedSurfaceAreaName_Key, std::make_any(sharedSurfaceAreaListName)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -102,10 +102,7 @@ TEST_CASE("SimplnxCore::MinNeighborsFilter", "[SimplnxCore][MinNeighborsFilter]" args.insertOrAssign(MinNeighborsFilter::k_MinNumNeighbors_Key, std::make_any(3)); args.insertOrAssign(MinNeighborsFilter::k_ApplyToSinglePhase_Key, std::make_any(false)); - // args.insertOrAssign(MinNeighborsFilter::k_PhaseNumber_Key, std::make_any(0)); - // args.insertOrAssign(MinNeighborsFilter::k_FeaturePhases_Key, std::make_any(k_FeaturePhases)); args.insertOrAssign(MinNeighborsFilter::k_SelectedImageGeometryPath_Key, std::make_any(smallIn100Group)); - args.insertOrAssign(MinNeighborsFilter::k_CellDataAttributeMatrixPath_Key, std::make_any(cellDataAttributeMatrix)); args.insertOrAssign(MinNeighborsFilter::k_FeatureIdsPath_Key, std::make_any(featureIdsDataPath)); args.insertOrAssign(MinNeighborsFilter::k_NumNeighborsPath_Key, std::make_any(numNeighborPath)); // args.insertOrAssign(MinNeighborsFilter::k_IgnoredVoxelArrays_Key, std::make_any>(k_VoxelArrays)); @@ -131,6 +128,7 @@ TEST_CASE("SimplnxCore::MinNeighborsFilter", "[SimplnxCore][MinNeighborsFilter]" } } +#ifdef SIMPLNX_WRITE_TEST_OUTPUT { // Write out the DataStructure for later viewing/debugging Result result = nx::core::HDF5::FileWriter::CreateFile(fmt::format("{}/minimum_neighbors_test.dream3d", unit_test::k_BinaryTestOutputDir)); @@ -138,6 +136,7 @@ TEST_CASE("SimplnxCore::MinNeighborsFilter", "[SimplnxCore][MinNeighborsFilter]" auto resultH5 = HDF5::DataStructureWriter::WriteFile(dataStructure, fileWriter); SIMPLNX_RESULT_REQUIRE_VALID(resultH5); } +#endif } #if 0 diff --git a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp index dec0c97173..6d902ed9c5 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/DynamicTableExampleFilter.cpp @@ -50,7 +50,7 @@ std::vector DynamicTableExampleFilter::defaultTags() const Parameters DynamicTableExampleFilter::parameters() const { Parameters params; - params.insertSeparator({"Fixed Columns - Fixed Rows"}); + params.insertSeparator(Parameters::Separator{"Fixed Columns - Fixed Rows"}); { DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::StaticVectorInfo({"Col 1", "Col 2"})); @@ -58,7 +58,7 @@ Parameters DynamicTableExampleFilter::parameters() const DynamicTableInfo::TableDataType defaultTable{{{10, 20}, {30, 40}}}; params.insert(std::make_unique(k_Param1, "Fixed Columns - Fixed Rows", "DynamicTableParameter Example Help Text", defaultTable, tableInfo)); } - params.insertSeparator({"Fixed Column - Dynamic Row"}); + params.insertSeparator(Parameters::Separator{"Fixed Column - Dynamic Row"}); { DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::StaticVectorInfo({"Col 1", "Col 2"})); @@ -67,7 +67,7 @@ Parameters DynamicTableExampleFilter::parameters() const params.insert(std::make_unique(k_Param2, "Fixed Columns - Dynamic Row", "DynamicTableParameter Example Help Text", defaultTable, tableInfo)); } - params.insertSeparator({"Dynamic Column - Fixed Row"}); + params.insertSeparator(Parameters::Separator{"Dynamic Column - Fixed Row"}); { DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(2, "Col {}")); @@ -76,7 +76,7 @@ Parameters DynamicTableExampleFilter::parameters() const params.insert(std::make_unique(k_Param3, "Dynamic Columns - Fixed Row", "DynamicTableParameter Example Help Text", defaultTable, tableInfo)); } - params.insertSeparator({"Dynamic Column - Dynamic Row"}); + params.insertSeparator(Parameters::Separator{"Dynamic Column - Dynamic Row"}); { DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(2, "Col {}")); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp index fc73502ba5..822687d3f0 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter1Filter.cpp @@ -68,7 +68,7 @@ std::vector ExampleFilter1Filter::defaultTags() const Parameters ExampleFilter1Filter::parameters() const { Parameters params; - params.insertSeparator({"FileSystem Selections"}); + params.insertSeparator(Parameters::Separator{"FileSystem Selections"}); params.insert(std::make_unique(k_InputDir_Key, "Input Directory", "Example input directory help text", "Data", FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputDir)); params.insert(std::make_unique(k_InputFile_Key, "Input File", "Example input file help text", "/opt/local/bin/ninja", FileSystemPathParameter::ExtensionsType{}, @@ -78,31 +78,31 @@ Parameters ExampleFilter1Filter::parameters() const params.insert(std::make_unique(k_OutputFile_Key, "Output File", "Example output file help text", "", FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::OutputFile)); - params.insertSeparator({"Linked Parameter"}); + params.insertSeparator(Parameters::Separator{"Linked Parameter"}); params.insertLinkableParameter(std::make_unique(k_Param2, "BoolParameter", "The 2nd parameter", true)); params.insert(std::make_unique(k_Param1, "Float32Parameter", "The 1st parameter", 0.1234f)); params.linkParameters(k_Param2, k_Param1, true); params.insert(std::make_unique(k_Param3, "Int32Parameter", "The 1st parameter", 0)); - params.insertSeparator({"Vector Parameters"}); + params.insertSeparator(Parameters::Separator{"Vector Parameters"}); params.insert(std::make_unique("vec2_key", "Vect", "Example int32 vector help text", std::vector{10, 20}, std::vector{"X"s, "Y"s})); // params.insert(std::make_unique("Vec3_Key", "3D Dimensions", "", std::vector{-19, -100, 456}, std::vector{"X"s, "Y"s, "Z"s})); params.insert(std::make_unique("vec4_key", "RGBA", "Example uint8 vector help text", std::vector{0, 255, 128, 255}, std::vector{"R"s, "G"s, "B"s, "A"s})); // params.insert(std::make_unique("Vec4F_Key", "Quaternion", "", std::vector{0.0F, 84.98F, 234.12F, 985.98F}, std::vector{"U"s, "V"s, "W"s, "X"s})); // params.insert(std::make_unique("Vec6F_Key", "Tensor?", "", std::vector(6), std::vector{"U"s, "V"s, "W"s, "X"s, "B"s, "A"s})); - params.insertSeparator({"Other Parameters"}); + params.insertSeparator(Parameters::Separator{"Other Parameters"}); params.insert(std::make_unique(k_Param5, "StringParameter", "Example string help text", "test string")); params.insert(std::make_unique(k_Param6, "Numeric Type", "Example numeric type help text", NumericType::int32)); - params.insertSeparator({"Big Parameters"}); + params.insertSeparator(Parameters::Separator{"Big Parameters"}); params.insert(std::make_unique( k_Param4, "Input File List", "The values that are used to generate the input file list. See GeneratedFileListParameter for more information.", GeneratedFileListParameter::ValueType{})); params.insert(std::make_unique(k_Param7, "Data Thresholds", "DataArray thresholds to mask", ArrayThresholdSet{})); // param10 should be active if either param8 OR param9 are the correct value - params.insertSeparator({"Multiple Linked Parameters"}); + params.insertSeparator(Parameters::Separator{"Multiple Linked Parameters"}); params.insertLinkableParameter(std::make_unique(k_Param8, "Bool Parameter", "A boolean Parameter", true)); params.insertLinkableParameter(std::make_unique(k_Param9, "Choices Parameter", "A choices parameter", 0, ChoicesParameter::Choices{"0", "1", "2"})); params.insert(std::make_unique(k_Param10, "Int32 Parameter", "An Integer Parameter", 42)); diff --git a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp index fc8d2aa047..ba99137ece 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/ExampleFilter2Filter.cpp @@ -69,24 +69,25 @@ std::vector ExampleFilter2Filter::defaultTags() const Parameters ExampleFilter2Filter::parameters() const { Parameters params; - params.insertSeparator({"1rst Group of Parameters"}); + params.insertSeparator(Parameters::Separator{"1rst Group of Parameters"}); params.insertLinkableParameter(std::make_unique(k_Param7, "Bool Parameter", "Example bool help text", true)); - params.insertLinkableParameter(std::make_unique(k_Param3, "ChoicesParameter", "Example choices help text", 0, ChoicesParameter::Choices{"foo", "bar", "baz"})); + params.insertLinkableParameter(std::make_unique(k_Param3, "Choices Parameter", "Example choices help text", 0, ChoicesParameter::Choices{"foo", "bar", "baz"})); - params.insertSeparator({"2nd Group of Parameters"}); + params.insertSeparator(Parameters::Separator{"2nd Group of Parameters"}); DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo(2, "Col {}")); tableInfo.setRowsInfo(DynamicTableInfo::DynamicVectorInfo(0, "Row {}")); DynamicTableInfo::TableDataType defaultTable{{{10, 20}, {30, 40}}}; - params.insert(std::make_unique(k_Param13, "DynamicTableParameter", "DynamicTableParameter Example Help Text", defaultTable, tableInfo)); + params.insert(std::make_unique(k_Param13, "Dynamic Table Parameter", "DynamicTableParameter Example Help Text", defaultTable, tableInfo)); // These should show up under the "Required Objects" Section in the GUI - params.insert(std::make_unique(k_Param9, "DataGroupSelectionParameter", "Example data group selection help text", DataPath{}, + params.insert(std::make_unique(k_Param9, "DataGroup Selection Parameter", "Example data group selection help text", DataPath{}, DataGroupSelectionParameter::AllowedTypes{BaseGroup::GroupType::DataGroup})); - params.insert(std::make_unique(k_Param10, "DataPathSelectionParameter", "Example data path selection help text", DataPath{})); + params.insert(std::make_unique(k_Param10, "DataPath Selection Parameter", "Example data path selection help text", DataPath{})); params.insert(std::make_unique(k_Param6, "Array Selection", "Example array selection help text", ArraySelectionParameter::ValueType{}, nx::core::GetAllDataTypes())); - params.insert(std::make_unique(k_Param11, "GeometrySelectionParameter", "Example geometry selection help text", DataPath{}, GeometrySelectionParameter::AllowedTypes{})); - params.insert(std::make_unique(k_Param12, "MultiArraySelectionParameter", "Example multiarray selection help text", MultiArraySelectionParameter::ValueType{}, + params.insert( + std::make_unique(k_Param11, "Geometry Selection Parameter", "Example geometry selection help text", DataPath{}, GeometrySelectionParameter::AllowedTypes{})); + params.insert(std::make_unique(k_Param12, "MultiArray Selection Parameter", "Example multiarray selection help text", MultiArraySelectionParameter::ValueType{}, MultiArraySelectionParameter::AllowedTypes{IArray::ArrayType::Any}, nx::core::GetAllDataTypes())); params.linkParameters(k_Param7, k_Param9, std::make_any(true)); @@ -96,7 +97,7 @@ Parameters ExampleFilter2Filter::parameters() const params.linkParameters(k_Param3, k_Param11, std::make_any(2)); // These should show up under the "Created Objects" section in the GUI - params.insert(std::make_unique(k_Param8, "DataGroupCreationParameter", "Example data group creation help text", DataPath{})); + params.insert(std::make_unique(k_Param8, "DataGroup Creation Parameter", "Example data group creation help text", DataPath{})); params.insert(std::make_unique(k_Param5, "Array Creation", "Example array creation help text", ArrayCreationParameter::ValueType{})); return params; diff --git a/src/simplnx/Filter/IFilter.cpp b/src/simplnx/Filter/IFilter.cpp index bd9b6b9fbf..9db327d847 100644 --- a/src/simplnx/Filter/IFilter.cpp +++ b/src/simplnx/Filter/IFilter.cpp @@ -299,12 +299,13 @@ Result IFilter::fromJson(const nlohmann::json& json) const auto bestMatches = StringUtilities::FindBestMatches(jsonKeyNotFound, paramKeyNotFound); for(const auto& match : bestMatches) { - if(!match.first.empty() && !match.second.empty()) + if(!std::get<0>(match).empty() && !std::get<1>(match).empty()) { - warnings.push_back( - Warning{-5434, fmt::format("Filter '{}': JSON Parameter Warning\n JSON Parameter Key '{}' is not an accepted Parameter Key for the filter. Closest match is " - "'{}'\n Suggested change is '{}' ==> '{}' (This is *ONLY* a suggestion.)\n Open the JSON file in a text editor and make the suggested changes.", - className(), match.first, match.second, match.first, match.second)}); + warnings.push_back(Warning{ + -5434, fmt::format( + "Filter '{}': JSON Parameter Warning\n JSON Parameter Key '{}' is not an accepted Parameter Key for the filter. Closest match is " + "'{}' with a match distance of {}.\n Suggested change is '{}' ==> '{}' (This is *ONLY* a suggestion.)\n Open the JSON file in a text editor and make the suggested changes.", + className(), std::get<0>(match), std::get<1>(match), std::get<2>(match), std::get<0>(match), std::get<1>(match))}); } } diff --git a/src/simplnx/Utilities/DataGroupUtilities.cpp b/src/simplnx/Utilities/DataGroupUtilities.cpp index 48b8f6ff3d..7c800200dd 100644 --- a/src/simplnx/Utilities/DataGroupUtilities.cpp +++ b/src/simplnx/Utilities/DataGroupUtilities.cpp @@ -6,7 +6,7 @@ namespace nx::core { bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& featureDataGroupPath, const std::vector& activeObjects, Int32Array& cellFeatureIds, size_t currentFeatureCount, - const IFilter::MessageHandler& messageHandler) + const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) { bool acceptableMatrix = true; @@ -64,6 +64,10 @@ bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& feature { for(const auto& dataArray : matchingDataArrayPtrs) { + if(shouldCancel) + { + return false; + } // Do the update "in place". This works because the keepList _should_ be sorted lowest to // highest. So we are constantly grabbing values from further in the array and copying // them to location to the front of the array. @@ -88,6 +92,10 @@ bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& feature featureIds[i] = static_cast(newNames[featureIds[i]]); featureIdsChanged = true; } + if(shouldCancel) + { + return false; + } } if(featureIdsChanged) diff --git a/src/simplnx/Utilities/DataGroupUtilities.hpp b/src/simplnx/Utilities/DataGroupUtilities.hpp index f525069477..63364ac0a0 100644 --- a/src/simplnx/Utilities/DataGroupUtilities.hpp +++ b/src/simplnx/Utilities/DataGroupUtilities.hpp @@ -23,10 +23,11 @@ namespace nx::core * @param activeObjects * @param cellFeatureIds * @param messageHandler + * @param shouldCancel * @return */ SIMPLNX_EXPORT bool RemoveInactiveObjects(DataStructure& dataStructure, const DataPath& featureDataGroupPath, const std::vector& activeObjects, Int32Array& cellFeatureIds, - size_t currentFeatureCount, const IFilter::MessageHandler& messageHandler); + size_t currentFeatureCount, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel); /** * @brief This function will gather all of the sibling DataArrays to the input DataPath, then filter out all the 'IgnoredDataPaths` diff --git a/src/simplnx/Utilities/SamplingUtils.hpp b/src/simplnx/Utilities/SamplingUtils.hpp index ce0d51df5a..493eb99e15 100644 --- a/src/simplnx/Utilities/SamplingUtils.hpp +++ b/src/simplnx/Utilities/SamplingUtils.hpp @@ -58,7 +58,7 @@ inline Result<> RenumberFeatures(DataStructure& dataStructure, const DataPath& n } } - if(!RemoveInactiveObjects(dataStructure, destCellFeatAttributeMatrixPath, activeObjects, destFeatureIdsRef, totalFeatures, messageHandler)) + if(!RemoveInactiveObjects(dataStructure, destCellFeatAttributeMatrixPath, activeObjects, destFeatureIdsRef, totalFeatures, messageHandler, shouldCancel)) { std::string ss = fmt::format("An error occurred while trying to remove the inactive objects from Attribute Matrix '{}'", destCellFeatAttributeMatrixPath.toString()); return MakeErrorResult(-606, ss); diff --git a/src/simplnx/Utilities/StringUtilities.hpp b/src/simplnx/Utilities/StringUtilities.hpp index 5f4e5ae966..50ee3192e2 100644 --- a/src/simplnx/Utilities/StringUtilities.hpp +++ b/src/simplnx/Utilities/StringUtilities.hpp @@ -476,14 +476,18 @@ inline uint32 CalculateLevenshteinDistance(const std::string& s1, const std::str return d[len1][len2]; } +using BestMatchType = std::tuple; + /** * @brief Finds the best matches between two lists of strings using the Levenshtein distance. * @param vec1 * @param vec2 * @return std::vector> */ -inline std::vector> FindBestMatches(const std::vector& vec1, const std::vector& vec2) +inline std::vector FindBestMatches(const std::vector& vec1, const std::vector& vec2) { + + std::vector bestMatches; std::vector> bestPairs; for(const auto& word1 : vec1) { @@ -499,7 +503,9 @@ inline std::vector> FindBestMatches(const st } } bestPairs.emplace_back(word1, bestMatch); + bestMatches.emplace_back(word1, bestMatch, bestDistance); } - return bestPairs; + // return bestPairs; + return bestMatches; } } // namespace nx::core::StringUtilities diff --git a/test/DataPathTest.cpp b/test/DataPathTest.cpp index 6dec2aacc0..55b6626aa2 100644 --- a/test/DataPathTest.cpp +++ b/test/DataPathTest.cpp @@ -24,7 +24,7 @@ bool CompareFromStringToExemplar(const std::string& input, const DataPath& exemp } } // namespace -TEST_CASE("Valid DataPath Creation") +TEST_CASE("Simplnx::Valid DataPath Creation", "[Simplnx][DataPath]") { DataPath commonExemplar1 = DataPath({"Path1"}).createChildPath("Path2"); REQUIRE(CompareFromStringToExemplar(k_CommonStringsVec[0], commonExemplar1)); @@ -51,7 +51,7 @@ TEST_CASE("Valid DataPath Creation") REQUIRE(CompareFromStringToExemplar(k_EdgeCaseStringsVec[3], edgeExemplar4)); } -TEST_CASE("Invalid DataPath Creation") +TEST_CASE("Simplnx::Invalid DataPath Creation", "[Simplnx][DataPath]") { DataPath invalidExemplar1 = DataPath{}; REQUIRE(!CompareFromStringToExemplar(k_InvalidStringsVec[0], invalidExemplar1)); diff --git a/test/FilterValidationTest.cpp b/test/FilterValidationTest.cpp index ced23c13c3..094ab127ae 100644 --- a/test/FilterValidationTest.cpp +++ b/test/FilterValidationTest.cpp @@ -6,9 +6,11 @@ #include "simplnx/DataStructure/DataStructure.hpp" #include "simplnx/Filter/FilterHandle.hpp" #include "simplnx/Filter/IFilter.hpp" +#include "simplnx/Filter/Parameters.hpp" #include "simplnx/Utilities/StringUtilities.hpp" #include "simplnx/unit_test/simplnx_test_dirs.hpp" +#include #include #include #include @@ -33,6 +35,7 @@ std::map s_ParameterMap; void GenerateParameterList() { ::s_ParameterMap.clear(); + ADD_PARAMETER_TRAIT(simplnx.SeparatorParameter, "e6936d18-7476-4855-9e13-e795d717c50f") ADD_PARAMETER_TRAIT(simplnx.OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea") ADD_PARAMETER_TRAIT(simplnx.ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") ADD_PARAMETER_TRAIT(simplnx.NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce") @@ -101,6 +104,8 @@ TEST_CASE("nx::core::Test Filter Parameter Keys", "[simplnx][Filter]") const auto pluginListPtr = Application::Instance()->getPluginList(); std::stringstream output; + // std::ofstream logFile(fmt::format("{}/human_names.log", unit_test::k_BinaryDir.view()), std::ios_base::trunc | std::ios_base::binary); + // std::set uniqueSepNames; // Loop on each Plugin for(const auto& plugin : pluginListPtr) @@ -114,8 +119,8 @@ TEST_CASE("nx::core::Test Filter Parameter Keys", "[simplnx][Filter]") { const std::string filterClassName = filterHandle.getClassName(); IFilter::UniquePointer filter = filterListPtr->createFilter(filterHandle); - const auto& parameters = filter->parameters(); + // Loop over each Parameter for(const auto& parameter : parameters) { @@ -156,6 +161,11 @@ TEST_CASE("nx::core::Test Filter Parameter Keys", "[simplnx][Filter]") } } + // for(const auto& name : uniqueSepNames) + // { + // logFile << "- " << name << "\n"; + // } + Application::DeleteInstance(); REQUIRE(Application::Instance() == nullptr); diff --git a/test/ParametersTest.cpp b/test/ParametersTest.cpp index bd063c4296..d0d506684e 100644 --- a/test/ParametersTest.cpp +++ b/test/ParametersTest.cpp @@ -20,7 +20,7 @@ TEST_CASE("ParametersTest") { Parameters params; params.insert(std::make_unique(k_FooParamKey, "Foo", "Test parameter", 42)); - params.insertSeparator({"Separator Name"}); + params.insertSeparator(Parameters::Separator{"Separator Name"}); REQUIRE_FALSE(params.containsGroup(k_BarParamKey)); params.insertLinkableParameter(std::make_unique(k_BarParamKey, "Bar", "Test parameter", false)); diff --git a/test/StringUtilitiesTest.cpp b/test/StringUtilitiesTest.cpp index 3c950a0918..33e1393613 100644 --- a/test/StringUtilitiesTest.cpp +++ b/test/StringUtilitiesTest.cpp @@ -7,7 +7,7 @@ using namespace nx::core; -TEST_CASE("Empty Input Utility Function Test: split(str, char), split(str, char, bool), specific_split(str, char, StringUtilities::SplitType)") +TEST_CASE("Simplnx::StringUtilities::Split Test", "[Simplnx][StringUtilities]") { std::string emptyInput = ""; std::string noDelimiterInput = "ThisIsABaselineTest"; @@ -70,7 +70,7 @@ TEST_CASE("Empty Input Utility Function Test: split(str, char), split(str, char, REQUIRE(result == std::vector{noDelimiterInput}); } -TEST_CASE("Utility Function Test: split(str, char)") +TEST_CASE("Simplnx::StringUtilities Utility Function Test1", "[Simplnx][StringUtilities]") { // Case 1 std::string inputStr = "This|Is|A|Baseline|Test"; @@ -94,7 +94,7 @@ TEST_CASE("Utility Function Test: split(str, char)") REQUIRE(result == std::vector{"This", "Is", "A", "Baseline", "Test"}); } -TEST_CASE("Utility Function Test: split(str, char, bool)") +TEST_CASE("Simplnx::StringUtilities Utility Function Test2", "[Simplnx][StringUtilities]") { std::array k_Delimiter = {'|'}; // Case 1 @@ -140,7 +140,7 @@ TEST_CASE("Utility Function Test: split(str, char, bool)") REQUIRE(result == std::vector{"", "", "This", "Is", "", "A", "", "Baseline", "Test", "", ""}); } -TEST_CASE("Utility Function Test: specific_split(str, char, StringUtilities::SplitType)") +TEST_CASE("Simplnx::StringUtilities Utility Function Test3", "[Simplnx][StringUtilities]") { std::array k_Delimiter = {'|'}; std::string inputStr = "||This|Is||A||Baseline|Test||"; diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py index d9122fd3fc..43eb930e04 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/01_Small_IN100_Morphological_Statistics.py @@ -87,7 +87,7 @@ # Filter 6 # Instantiate Filter -nx_filter = nx.FindNeighborsFilter() +nx_filter = nx.FindFeatureNeighborsFilter() # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py index b4cc2c937a..e6afc1b6a4 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/08_Small_IN100_Full_Reconstruction.py @@ -205,7 +205,7 @@ # Filter 12 # Instantiate Filter -nx_filter = nx.FindNeighborsFilter() +nx_filter = nx.FindFeatureNeighborsFilter() # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, @@ -280,7 +280,7 @@ # Filter 16 # Instantiate Filter -nx_filter = nx.FindNeighborsFilter() +nx_filter = nx.FindFeatureNeighborsFilter() # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, @@ -304,7 +304,6 @@ result = nx_filter.execute( data_structure=data_structure, apply_to_single_phase=False, - cell_attribute_matrix_path=nx.DataPath("DataContainer/CellData"), feature_ids_path=nx.DataPath("DataContainer/CellData/FeatureIds"), input_image_geometry_path=nx.DataPath("DataContainer"), min_num_neighbors=2, diff --git a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py index a33ab3d89e..d303e180c5 100644 --- a/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py +++ b/wrapping/python/examples/pipelines/OrientationAnalysis/FindBiasedFeatures.py @@ -49,7 +49,7 @@ # Filter 2 # Instantiate Filter -nx_filter = nx.FindNeighborsFilter() +nx_filter = nx.FindFeatureNeighborsFilter() # Execute Filter with Parameters result = nx_filter.execute( data_structure=data_structure, diff --git a/wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py b/wrapping/python/examples/pipelines/Simplnx/Import_CSV_File.py similarity index 100% rename from wrapping/python/examples/pipelines/Simplnx/Import_CSV_Data.py rename to wrapping/python/examples/pipelines/Simplnx/Import_CSV_File.py diff --git a/wrapping/python/examples/pipelines/SourceList.cmake b/wrapping/python/examples/pipelines/SourceList.cmake index d11139a299..dc3b0ce707 100644 --- a/wrapping/python/examples/pipelines/SourceList.cmake +++ b/wrapping/python/examples/pipelines/SourceList.cmake @@ -21,7 +21,7 @@ set(SIMPLNX_PYTHON_TESTS CombineSTLFiles EnsembleInfoReader Import_ASCII - Import_CSV_Data + Import_CSV_File Import_STL_Model ReplaceElementAttributesWithNeighbor ResamplePorosityImage