0022315: EDF 2722 GEOM: Import STL in GEOM

[modules/geom.git] / src / GEOMImpl / GEOMImpl_IInsertOperations.cxx

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 37e7fea8af817503170a52b58da3917fec5b3a32..a3e2fcef39a31390b4f2d3ca85821405aeed5898 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -74,6 +74,21 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
+/**
+ * This function returns the input format name from the original format name.
+ */
+static TCollection_AsciiString GetImportFormatName
+        (const TCollection_AsciiString& theFormatName)
+{
+  Standard_Integer aLastInd = 4;
+
+  if (theFormatName.Search("STL") == 1) {
+    aLastInd = 3;
+  }
+
+  return theFormatName.SubString(1, aLastInd);
+}
+
 //=============================================================================
 /*!
  *  constructor
@@ -236,7 +251,8 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
   if (aFunction->GetDriverGUID() != GEOMImpl_ImportDriver::GetID()) return result;
 
   Handle(TCollection_HAsciiString) aHLibName;
-  if (!IsSupported(Standard_True, theFormatName.SubString(1,4), aHLibName)) {
+  if (!IsSupported
+          (Standard_True, GetImportFormatName(theFormatName), aHLibName)) {
     return result;
   }
   TCollection_AsciiString aLibName = aHLibName->String();
@@ -320,7 +336,8 @@ TCollection_AsciiString GEOMImpl_IInsertOperations::ReadValue
   if (theFileName.IsEmpty() || theFormatName.IsEmpty() || theParameterName.IsEmpty()) return aValue;
 
   Handle(TCollection_HAsciiString) aHLibName;
-  if (!IsSupported(Standard_True, theFormatName.SubString(1,4), aHLibName)) {
+  if (!IsSupported
+          (Standard_True, GetImportFormatName(theFormatName), aHLibName)) {
     return aValue;
   }
   TCollection_AsciiString aLibName = aHLibName->String();