Rename ImportTextDataFilter to ReadCSVFileFilter.

Signed-off-by: Joey Kleingers <[email protected]>
BlueQuartzSoftware · Oct 11, 2023 · 91fe136 · 91fe136
1 parent fd7e5f0
commit 91fe136
Show file tree

Hide file tree

Showing 23 changed files with 307 additions and 312 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -259,7 +259,7 @@ set(CoreParameters
   MultiPathSelectionParameter
   NumberParameter
   NumericTypeParameter
-  ImportTextDataParameter
+  ReadCSVFileParameter
   ImportHDF5DatasetParameter
   StringParameter
   VectorParameter
@@ -431,7 +431,7 @@ set(COMPLEX_HDRS
   ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.hpp
 
   ${COMPLEX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.hpp
-  ${COMPLEX_SOURCE_DIR}/Parameters/util/TextImporterData.hpp
+  ${COMPLEX_SOURCE_DIR}/Parameters/util/ReadCSVData.hpp
 
   ${COMPLEX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.hpp
   ${COMPLEX_SOURCE_DIR}/Pipeline/Pipeline.hpp
@@ -630,7 +630,7 @@ set(COMPLEX_SRCS
   ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateAttributeMatrixAction.cpp
   ${COMPLEX_SOURCE_DIR}/Filter/Actions/CreateGridMontageAction.cpp
 
-  ${COMPLEX_SOURCE_DIR}/Parameters/util/TextImporterData.cpp
+  ${COMPLEX_SOURCE_DIR}/Parameters/util/ReadCSVData.cpp
   ${COMPLEX_SOURCE_DIR}/Parameters/util/DynamicTableInfo.cpp
 
   ${COMPLEX_SOURCE_DIR}/Pipeline/AbstractPipelineNode.cpp

diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt
@@ -77,7 +77,7 @@ set(FilterList
   ImageContouringFilter
   IdentifySample
   ImportBinaryCTNorthstarFilter
-  ImportTextDataFilter
+  ReadCSVFileFilter
   ImportDeformKeyFileV12Filter
   ImportDREAM3DFilter
   ImportHDF5Dataset

diff --git a/.../ComplexCore/docs/ImportTextDataFilter.md → ...ins/ComplexCore/docs/ReadCSVFileFilter.md b/.../ComplexCore/docs/ImportTextDataFilter.md → ...ins/ComplexCore/docs/ReadCSVFileFilter.md
@@ -1,4 +1,4 @@
-# Import Text Data 
+# Read CSV File 
 
 ## Group (Subgroup) ##
 
@@ -58,7 +58,7 @@ Afterwards, you end up with a data structure that looks like this:
 
 | Name                                                           | Type             | Description                                                                                                                                                                                                                                                 |
 |----------------------------------------------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Importer Data Object                                           | TextImporterData  | The object that holds all data relevant to importing the data, such as input file path, custom headers, start import line number, data types for all the imported arrays, headers line number, header mode, imported array tuple dimensions, delimiters, etc. |
+| Importer Data Object                                           | ReadCSVData  | The object that holds all data relevant to importing the data, such as input file path, custom headers, start import line number, data types for all the imported arrays, headers line number, header mode, imported array tuple dimensions, delimiters, etc. |
 | Use Existing Attribute Matrix                                  | bool             | Determines whether or not to store the imported data arrays in an existing attribute matrix                                                                                                                                                                 |
 | Existing Attribute Matrix (Use Existing Attribute Matrix - ON) | DataPath         | The data path to the existing attribute matrix where the imported arrays will be stored                                                                                                                                                                     |
 | New Attribute Matrix (Use Existing Attribute Matrix - OFF)     | DataPath         | The data path to the newly created attribute matrix where the imported arrays will be stored                                                                                                                                                                |

diff --git a/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline
@@ -84,7 +84,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "complex::ImportTextDataFilter",
+        "name": "complex::ReadCSVFileFilter",
         "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261"
       },
       "isDisabled": false

diff --git a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline
@@ -41,7 +41,7 @@
       },
       "comments": "",
       "filter": {
-        "name": "complex::ImportTextDataFilter",
+        "name": "complex::ReadCSVFileFilter",
         "uuid": "373be1f8-31cf-49f6-aa5d-e356f4f3f261"
       },
       "isDisabled": false

diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp
@@ -55,7 +55,7 @@
 #include "ComplexCore/Filters/GenerateColorTableFilter.hpp"
 #include "ComplexCore/Filters/IdentifySample.hpp"
 #include "ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp"
-#include "ComplexCore/Filters/ImportTextDataFilter.hpp"
+#include "ComplexCore/Filters/ReadCSVFileFilter.hpp"
 #include "ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp"
 #include "ComplexCore/Filters/ImportDREAM3DFilter.hpp"
 #include "ComplexCore/Filters/ImportHDF5Dataset.hpp"
@@ -166,7 +166,7 @@ namespace complex
     {complex::Uuid::FromString("0d0a6535-6565-51c5-a3fc-fbc00008606d").value(), complex::FilterTraits<GenerateColorTableFilter>::uuid}, // GenerateColorTable
     {complex::Uuid::FromString("0e8c0818-a3fb-57d4-a5c8-7cb8ae54a40a").value(), complex::FilterTraits<IdentifySample>::uuid}, // IdentifySample
     {complex::Uuid::FromString("f2259481-5011-5f22-9fcb-c92fb6f8be10").value(), complex::FilterTraits<ImportBinaryCTNorthstarFilter>::uuid}, // ImportBinaryCTNorthstarFilter
-    {complex::Uuid::FromString("bdb978bc-96bf-5498-972c-b509c38b8d50").value(), complex::FilterTraits<ImportTextDataFilter>::uuid}, // ReadASCIIData
+    {complex::Uuid::FromString("bdb978bc-96bf-5498-972c-b509c38b8d50").value(), complex::FilterTraits<ReadCSVFileFilter>::uuid}, // ReadASCIIData
     {complex::Uuid::FromString("043cbde5-3878-5718-958f-ae75714df0df").value(), complex::FilterTraits<ImportDREAM3DFilter>::uuid}, // DataContainerReader
     {complex::Uuid::FromString("9e98c3b0-5707-5a3b-b8b5-23ef83b02896").value(), complex::FilterTraits<ImportHDF5Dataset>::uuid}, // ImportHDF5Dataset
     {complex::Uuid::FromString("a7007472-29e5-5d0a-89a6-1aed11b603f8").value(), complex::FilterTraits<ImportTextFilter>::uuid}, // ImportAsciDataArray