REFAC: Improved error messages

Source/GeometryMappers/imstkOneToOneMap.cpp

@@ -147,24 +147,18 @@ OneToOneMap::print() const
 void
 OneToOneMap::setParentGeometry(std::shared_ptr<Geometry> parent)
 {
-    auto pointSet = std::dynamic_pointer_cast<PointSet>(parent);
-    if (parent == nullptr)
-    {
-        LOG(WARNING) << "The geometry provided is not a PointSet!\n";
-        return;
-    }
+    CHECK(parent != nullptr) << "The parent geometry provided is nullptr";
+    CHECK(std::dynamic_pointer_cast<PointSet>(parent) != nullptr) <<
+        "The parent geometry provided is not PointSet";
     GeometryMap::setParentGeometry(parent);
 }
 
 void
 OneToOneMap::setChildGeometry(std::shared_ptr<Geometry> child)
 {
-    auto pointSet = std::dynamic_pointer_cast<PointSet>(child);
-    if (pointSet == nullptr)
-    {
-        LOG(WARNING) << "The geometry provided is not a PointSet!\n";
-        return;
-    }
+    CHECK(child != nullptr) << "The child geometry provided is nullptr";
+    CHECK(std::dynamic_pointer_cast<PointSet>(child) != nullptr) <<
+        "The child geometry provided is not PointSet";
     GeometryMap::setChildGeometry(child);
 }
 

Source/GeometryMappers/imstkTetraTriangleMap.cpp

@@ -162,18 +162,18 @@ TetraTriangleMap::isValid() const
 void
 TetraTriangleMap::setParentGeometry(std::shared_ptr<Geometry> parent)
 {
+    CHECK(parent != nullptr) << "The parent geometry provided is nullptr";
     CHECK(std::dynamic_pointer_cast<TetrahedralMesh>(parent) != nullptr) <<
-        "The geometry provided as parent is not of tetrahedral type";
-
+        "The parent geometry provided is not TetrahedralMesh";
     GeometryMap::setParentGeometry(parent);
 }
 
 void
 TetraTriangleMap::setChildGeometry(std::shared_ptr<Geometry> child)
 {
+    CHECK(child != nullptr) << "The child geometry provided is nullptr";
     CHECK(std::dynamic_pointer_cast<SurfaceMesh>(child) != nullptr) <<
-        "The geometry provided as child is not of triangular type (surface)";
-
+        "The child geometry provided is not SurfaceMesh";
     GeometryMap::setChildGeometry(child);
 }