-// Copyright (C) 2014-2017 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
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "GeomAlgoAPI_Tools.h"
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();
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)
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;
}