X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_STEPExport.cpp;h=c9e9830c1829b293d7b67beac4db593e9b902fa8;hb=d8101383b10bf780a1acf5a356007ad6dbf17711;hp=ab2ac793111d1bc994ae56977f3721f2f15ab7e5;hpb=d7d6265cce5e49374130cb4c6a4cfb3a90eba875;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
index ab2ac7931..c9e9830c1 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_STEPExport.cpp
@@ -1,25 +1,34 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
+// File:    GEOMALGOAPI_STEPExport.cpp
+// Created: May 14, 2015
+// Author:  Sergey POKHODENKO
+
 #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)
+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
@@ -31,10 +40,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 )
@@ -46,5 +55,3 @@ bool Export(const TCollection_AsciiString& theFileName,
   }
   return false;
 }
-
-} // namespace STEPExport