From 573cb8445984e8203bb172dc0f2efd8976b3876f Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 14 Nov 2023 16:58:50 -0500 Subject: [PATCH] ENH: Consistent use of "Numeric Type" in human labels. (#767) Signed-off-by: Michael Jackson --- .../src/ComplexCore/Filters/ArrayCalculatorFilter.cpp | 2 +- .../ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp | 2 +- .../ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp | 2 +- .../src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp | 2 +- .../TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp index f00ff1e30f..907fcb9124 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ArrayCalculatorFilter.cpp @@ -53,7 +53,7 @@ Parameters ArrayCalculatorFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_InfixEquation_Key, "Infix Expression", "The mathematical expression used to calculate the output array", CalculatorParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Cell Data"}); - params.insert(std::make_unique(k_ScalarType_Key, "Output Scalar Type", "The data type of the calculated array", NumericType::float64)); + 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{})); return params; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp index 1eedffb084..689f97823c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/CreateDataArray.cpp @@ -68,7 +68,7 @@ Parameters CreateDataArray::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_NumericType_Key, "Numeric Type", "Numeric Type of data to create", NumericType::int32)); + 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_InitilizationValue_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)); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp index 4434d66a6b..746e4aa3f9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp @@ -64,7 +64,7 @@ Parameters ReadRawBinaryFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); 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, "Scalar Type", "Data type of the binary data", NumericType::int8)); + params.insert(std::make_unique(k_ScalarType_Key, "Input Numeric Type", "Data type of the binary data", NumericType::int8)); DynamicTableInfo tableInfo; tableInfo.setColsInfo(DynamicTableInfo::DynamicVectorInfo{1, "Value {}"}); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp index 4296c06575..b0a2daae29 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadTextDataArrayFilter.cpp @@ -54,7 +54,7 @@ Parameters ReadTextDataArrayFilter::parameters() const params.insertSeparator(Parameters::Separator{"Input Parameters"}); params.insert(std::make_unique(k_InputFileKey, "Input File", "File path that points to the imported file", fs::path(""), FileSystemPathParameter::ExtensionsType{}, FileSystemPathParameter::PathType::InputFile)); - params.insert(std::make_unique(k_ScalarTypeKey, "Scalar Type", "Data Type to interpret and store data into.", NumericType::int8)); + params.insert(std::make_unique(k_ScalarTypeKey, "Input Numeric Type", "Data Type to interpret and store data into.", NumericType::int8)); params.insert(std::make_unique(k_NCompKey, "Number of Components", "Number of columns", 1)); params.insert(std::make_unique(k_NSkipLinesKey, "Skip Header Lines", "Number of lines at the start of the file to skip", 0)); params.insert(std::make_unique(k_DelimiterChoiceKey, "Delimiter", "Delimiter for values on a line", 0, diff --git a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp index 81f264932a..bd84586bd6 100644 --- a/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp +++ b/src/Plugins/TestOne/src/TestOne/Filters/CreateOutOfCoreArray.cpp @@ -56,7 +56,7 @@ std::string CreateOutOfCoreArray::humanName() const Parameters CreateOutOfCoreArray::parameters() const { Parameters params; - params.insert(std::make_unique(k_NumericType_Key, "Numeric Type", "Numeric Type of data to create", NumericType::int32)); + 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_NumComps_Key, "Number of Components", "Number of components", 1)); DynamicTableParameter::ValueType dynamicTable(1, 1, {"DIM"}, {""}); dynamicTable.setMinCols(1);