updated copyright message

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Tools.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Tools.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Tools.cpp
index 9f7f5ec7848bf162c2355050222202457f16e86d..dc13d953ce878864c61fe80c6c5c6f3eef1fee1d 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Tools.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Tools.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -45,6 +45,8 @@ std::string File_Tools::extension(const std::string& theFileName)
   TCollection_AsciiString aFileName(theFileName.c_str());
   OSD_Path aPath(aFileName);
   TCollection_AsciiString anExtension = aPath.Extension();
+  if (anExtension.Length() < 2)
+    return "";
   // TCollection_AsciiString are numbered from 1
   anExtension = anExtension.SubString(2, anExtension.Length());
   anExtension.UpperCase();
@@ -59,6 +61,14 @@ std::string File_Tools::name(const std::string& theFileName)
   return aPath.Name().ToCString();
 }
 
+std::string File_Tools::path(const std::string& theFileName)
+{
+  OSD_Path aPath (theFileName.c_str());
+  Standard_Integer aTrekLen =
+    int(theFileName.size()) - aPath.Extension().Length() - aPath.Name().Length();
+  return theFileName.substr(0, aTrekLen);
+}
+
 bool AlgoError::isAlgorithmFailed(const GeomMakeShapePtr& theAlgorithm,
                                   const std::string& theFeature,
                                   std::string& theError)
@@ -74,14 +84,14 @@ bool AlgoError::isAlgorithmFailed(const GeomMakeShapePtr& theAlgorithm,
   if (!theAlgorithm->shape() || theAlgorithm->shape()->isNull()) {
     theError = "Error: Resulting shape";
     if (!theFeature.empty())
-      theError += "of " + theFeature;
+      theError += " of " + theFeature;
     theError += " is Null.";
     return true;
   }
   if (!theAlgorithm->isValid()) {
     theError = "Error: Resulting shape";
     if (!theFeature.empty())
-      theError += "of " + theFeature;
+      theError += " of " + theFeature;
     theError += " is not valid.";
     return true;
   }