ENH: Geometry Constants Cleanup & GeomTypeToString Method (#1187)

* Move all geometry constants to geometry classes and use consistent names.
* Add GeomTypeToString helper method to IGeometry.
* Explicitly specify namespace and optimized enum to string processing

---------

Signed-off-by: Joey Kleingers <[email protected]>
Co-authored-by: nyoungbq <[email protected]>

Author: joeykleingers

src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReaderFilter.cpp

@@ -91,7 +91,7 @@ Parameters ITKImageReaderFilter::parameters() const
 
   params.insertSeparator(Parameters::Separator{"Output Data Object(s)"});
   params.insert(std::make_unique<DataGroupCreationParameter>(k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"ImageDataContainer"})));
-  params.insert(std::make_unique<DataObjectNameParameter>(k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName));
+  params.insert(std::make_unique<DataObjectNameParameter>(k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix", ImageGeom::k_CellAttributeMatrixName));
   params.insert(std::make_unique<DataObjectNameParameter>(k_ImageDataArrayPath_Key, "Created Cell Data",
                                                           "The name of the created image data array. Will be stored in the created Cell Attribute Matrix", "ImageData"));
 

src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStackFilter.cpp

@@ -397,7 +397,7 @@ Parameters ITKImportImageStackFilter::parameters() const
 
   params.insertSeparator(Parameters::Separator{"Output Data"});
   params.insert(std::make_unique<DataGroupCreationParameter>(k_ImageGeometryPath_Key, "Created Image Geometry", "The path to the created Image Geometry", DataPath({"ImageDataContainer"})));
-  params.insert(std::make_unique<DataObjectNameParameter>(k_CellDataName_Key, "Cell Data Name", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName));
+  params.insert(std::make_unique<DataObjectNameParameter>(k_CellDataName_Key, "Cell Data Name", "The name of the created cell attribute matrix", ImageGeom::k_CellAttributeMatrixName));
   params.insert(std::make_unique<DataObjectNameParameter>(k_ImageDataArrayPath_Key, "Created Image Data", "The path to the created image data array", "ImageData"));
 
   params.linkParameters(k_ConvertToGrayScale_Key, k_ColorWeights_Key, true);

src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKMhaFileReaderFilter.cpp

@@ -288,8 +288,8 @@ Parameters ITKMhaFileReaderFilter::parameters() const
   params.insert(std::make_unique<DataGroupCreationParameter>(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<DataObjectNameParameter>(ITKImageReaderFilter::k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix", ImageGeom::k_CellDataName));
+  params.insert(std::make_unique<DataObjectNameParameter>(ITKImageReaderFilter::k_CellDataName_Key, "Created Cell Attribute Matrix", "The name of the created cell attribute matrix",
+                                                          ImageGeom::k_CellAttributeMatrixName));
   params.insertSeparator(Parameters::Separator{"Output Cell Data"});
   params.insert(std::make_unique<DataObjectNameParameter>(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"));

src/Plugins/ITKImageProcessing/test/ITKImageWriterTest.cpp

@@ -19,7 +19,7 @@ namespace
 {
 const std::string k_ImageStackDir = unit_test::k_DataDir.str() + "/ImageStack";
 const DataPath k_ImageGeomPath = {{"ImageGeometry"}};
-const DataPath k_ImageDataPath = k_ImageGeomPath.createChildPath(ImageGeom::k_CellDataName).createChildPath("ImageData");
+const DataPath k_ImageDataPath = k_ImageGeomPath.createChildPath(ImageGeom::k_CellAttributeMatrixName).createChildPath("ImageData");
 
 /**
  * @return

src/Plugins/ITKImageProcessing/test/ITKImportImageStackTest.cpp

@@ -23,7 +23,7 @@ namespace
 {
 const std::string k_ImageStackDir = unit_test::k_DataDir.str() + "/ImageStack";
 const DataPath k_ImageGeomPath = {{"ImageGeometry"}};
-const DataPath k_ImageDataPath = k_ImageGeomPath.createChildPath(ImageGeom::k_CellDataName).createChildPath("ImageData");
+const DataPath k_ImageDataPath = k_ImageGeomPath.createChildPath(ImageGeom::k_CellAttributeMatrixName).createChildPath("ImageData");
 const std::string k_FlippedImageStackDirName = "image_flip_test_images";
 const DataPath k_XGeneratedImageGeomPath = DataPath({"xGeneratedImageGeom"});
 const DataPath k_YGeneratedImageGeomPath = DataPath({"yGeneratedImageGeom"});

src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline

@@ -50,8 +50,8 @@
               "DataContainer/Cell Feature Data/SlipSystems",
               "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio",
               "TriangleDataContainer",
-              "TriangleDataContainer/SharedTriList",
-              "TriangleDataContainer/SharedVertexList",
+              "TriangleDataContainer/Shared Faces List",
+              "TriangleDataContainer/Shared Vertex List",
               "TriangleDataContainer/Face Data",
               "TriangleDataContainer/Vertex Data",
               "TriangleDataContainer/Vertex Data/NodeType",

src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline

@@ -50,14 +50,14 @@
               "DataContainer/Cell Feature Data/SlipSystems",
               "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio",
               "TriangleDataContainer",
-              "TriangleDataContainer/SharedTriList",
-              "TriangleDataContainer/SharedVertexList",
+              "TriangleDataContainer/Shared Faces List",
+              "TriangleDataContainer/Shared Vertex List",
               "TriangleDataContainer/Face Data",
               "TriangleDataContainer/Vertex Data",
               "TriangleDataContainer/Vertex Data/NodeType",
               "TriangleDataContainer/Face Data/FaceLabels",
               "TriangleDataContainer/QM Face Feature Data",
-              "TriangleDataContainer/Edge List"
+              "TriangleDataContainer/Shared Edge List"
             ],
             "file_path": "Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d"
           },

src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline

@@ -50,14 +50,14 @@
               "DataContainer/Cell Feature Data/SlipSystems",
               "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio",
               "TriangleDataContainer",
-              "TriangleDataContainer/SharedTriList",
-              "TriangleDataContainer/SharedVertexList",
+              "TriangleDataContainer/Shared Faces List",
+              "TriangleDataContainer/Shared Vertex List",
               "TriangleDataContainer/Face Data",
               "TriangleDataContainer/Vertex Data",
               "TriangleDataContainer/Vertex Data/NodeType",
               "TriangleDataContainer/Face Data/FaceLabels",
               "TriangleDataContainer/QM Face Feature Data",
-              "TriangleDataContainer/Edge List",
+              "TriangleDataContainer/Shared Edge List",
               "TriangleDataContainer/Face Data/FaceAreas",
               "TriangleDataContainer/Face Data/FaceNormals",
               "TriangleDataContainer/Face Data/FaceDihedralAngles",

src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline

@@ -50,14 +50,14 @@
               "DataContainer/Cell Feature Data/SlipSystems",
               "DataContainer/Cell Feature Data/SurfaceAreaVolumeRatio",
               "TriangleDataContainer",
-              "TriangleDataContainer/SharedTriList",
-              "TriangleDataContainer/SharedVertexList",
+              "TriangleDataContainer/Shared Faces List",
+              "TriangleDataContainer/Shared Vertex List",
               "TriangleDataContainer/Face Data",
               "TriangleDataContainer/Vertex Data",
               "TriangleDataContainer/Vertex Data/NodeType",
               "TriangleDataContainer/Face Data/FaceLabels",
               "TriangleDataContainer/QM Face Feature Data",
-              "TriangleDataContainer/Edge List",
+              "TriangleDataContainer/Shared Edge List",
               "TriangleDataContainer/Face Data/FaceAreas",
               "TriangleDataContainer/Face Data/FaceNormals",
               "TriangleDataContainer/Face Data/FaceDihedralAngles",

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ComputeGBCDPoleFigureFilter.cpp

@@ -70,7 +70,7 @@ Parameters ComputeGBCDPoleFigureFilter::parameters() const
   params.insertSeparator(Parameters::Separator{"Output Pole Figure"});
   params.insert(std::make_unique<DataGroupCreationParameter>(k_ImageGeometryName_Key, "Image Geometry", "The path to the created image geometry", DataPath({"GBCD Pole Figure"})));
   params.insert(std::make_unique<DataObjectNameParameter>(k_CellAttributeMatrixName_Key, "Cell Attribute Matrix Name", "The name of the cell attribute matrix for the created image geometry",
-                                                          ImageGeom::k_CellDataName));
+                                                          ImageGeom::k_CellAttributeMatrixName));
   params.insert(std::make_unique<DataObjectNameParameter>(k_CellIntensityArrayName_Key, "Cell MRD Array Name", "The name of the created cell intensity data array", "MRD"));
 
   return params;