X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_STEPExport.cpp;h=b2125b91a538e0d675fc72cdef77392e0917610b;hb=cb0a7bdbea9f94ea30879522b230cbe773b60dc3;hp=9454f4a06a112a74b42a14b90e1f566a843c9f4e;hpb=b4be68ffcb00b8b9276a94b05ea613d9c411fde6;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
index 9454f4a06..b2125b91a 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
@@ -1,28 +1,51 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <GeomAlgoAPI_STEPExport.h>
 
+#include "GeomAlgoAPI_Tools.h"
+
+#include <TopoDS_Shape.hxx>
+
 // OOCT includes
 #include <IFSelect_ReturnStatus.hxx>
 #include <STEPControl_Writer.hxx>
 #include <Interface_Static.hxx>
 
-namespace STEPExport {
-
-bool Export (const TCollection_AsciiString& theFileName,
-             const TCollection_AsciiString& theFormatName,
-             const TopoDS_Shape& theShape,
-             TCollection_AsciiString&       theError,
-             const TDF_Label&               theShapeLabel)
+bool STEPExport(const std::string& theFileName,
+                const std::string& theFormatName,
+                const std::shared_ptr<GeomAPI_Shape>& theShape,
+                std::string& theError)
 {
   #ifdef _DEBUG
-  std::cout << "Export STEP into file " << theFileName.ToCString() << std::endl;
+  std::cout << "Export STEP into file " << theFileName << std::endl;
   #endif
 
+  if (!theShape.get()) {
+    theError = "STEP Export failed: An invalid argument";
+    return false;
+  }
+
   try
   {
-//    // Set "C" numeric locale to save numbers correctly
-//    Kernel_Utils::Localizer loc;
+    // Set "C" numeric locale to save numbers correctly
+    GeomAlgoAPI_Tools::Localizer loc;
 
     IFSelect_ReturnStatus status ;
     //VRV: OCC 4.0 migration
@@ -30,10 +53,10 @@ bool Export (const TCollection_AsciiString& theFileName,
     Interface_Static::SetCVal("xstep.cascade.unit","M");
     Interface_Static::SetCVal("write.step.unit", "M");
     Interface_Static::SetIVal("write.step.nonmanifold", 1);
-    status = aWriter.Transfer( theShape, STEPControl_AsIs );
+    status = aWriter.Transfer(theShape->impl<TopoDS_Shape>(), STEPControl_AsIs);
     //VRV: OCC 4.0 migration
     if( status == IFSelect_RetDone )
-      status = aWriter.Write( theFileName.ToCString() );
+      status = aWriter.Write(theFileName.c_str());
 
     // Return previous locale
     if( status == IFSelect_RetDone )
@@ -45,5 +68,3 @@ bool Export (const TCollection_AsciiString& theFileName,
   }
   return false;
 }
-
-} // namespace STEPExport