Support of the newer version of OCCT 7.2.0 with patches

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

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
index 4a7b52bf61db89d73a34a4d3e898272c4f142f82..0fca6a9d348c9a7bdb37cc68f0d78c1226ac615f 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_IGESExport.cpp
@@ -1,10 +1,26 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <GeomAlgoAPI_IGESExport.h>
 
-//// KERNEL includes
-//#include <utilities.h>
-//#include <Basics_Utils.hxx>
+#include "GeomAlgoAPI_Tools.h"
 
 // OOCT includes
 #include <IGESControl_Controller.hxx>
@@ -76,30 +92,38 @@ int KindOfBRep (const TopoDS_Shape& theShape)
 }
 
 //=============================================================================
-//extern "C" {
-namespace IGESExport {
-
-bool Export(const TCollection_AsciiString& theFileName,
-            const TCollection_AsciiString&,
-            const TopoDS_Shape& theShape,
-            TCollection_AsciiString& theError, const TDF_Label&)
+bool IGESExport(const std::string& theFileName,
+                const std::string& theFormatName,
+                const std::shared_ptr<GeomAPI_Shape>& theShape,
+                std::string& theError)
 {
-  //TODO(spo): pass version as argument of the function
-  TCollection_AsciiString aVersion = "5.3";
+  #ifdef _DEBUG
+  std::cout << "Export IGES into file " << theFileName << std::endl;
+  #endif
+
+  if (!theShape.get()) {
+    theError = "IGES Export failed: An invalid argument";
+    return false;
+  }
+
+  // theFormatName expected "IGES-5.1", "IGES-5.3"...
+  TCollection_AsciiString aFormatName(theFormatName.c_str());
+  TCollection_AsciiString aVersion = aFormatName.Token("-", 2);
+  #ifdef _DEBUG
+  if (!aVersion.IsEqual("5.1") || !aVersion.IsEqual("5.3"))
+    std::cout << "Warning: unrecognized version " << aVersion.ToCString()
+              << ". Default version: 5.1." << std::endl;
+  #endif
   // define, whether to write only faces (5.1 IGES format)
   // or shells and solids also (5.3 IGES format)
   int aBrepMode = 0;
   if( aVersion.IsEqual( "5.3" ) )
     aBrepMode = 1;
 
-  #ifdef _DEBUG
-  std::cout << "Export IGES into file " << theFileName.ToCString() << std::endl;
-  #endif
-
   // Mantis issue 0021350: check being exported shape, as some stand-alone
   // entities (edges, wires and vertices) cannot be saved in BRepMode
   if( aBrepMode == 1 ) {
-    int aKind = KindOfBRep( theShape );
+    int aKind = KindOfBRep( theShape->impl<TopoDS_Shape>() );
     if( aKind == -1 ) {
       theError = "EXPORT_IGES_HETEROGENEOUS_COMPOUND";
       return false;
@@ -109,8 +133,8 @@ bool Export(const TCollection_AsciiString& theFileName,
       aBrepMode = aKind;
   }
 
-//  // Set "C" numeric locale to save numbers correctly
-//  Kernel_Utils::Localizer loc;
+  // Set "C" numeric locale to save numbers correctly
+  GeomAlgoAPI_Tools::Localizer loc;
 
   // initialize writer
   IGESControl_Controller::Init();
@@ -122,13 +146,9 @@ bool Export(const TCollection_AsciiString& theFileName,
   Interface_Static::SetCVal( "write.precision.mode", "Max" );
 
   // perform shape writing
-  if( ICW.AddShape( theShape ) ) {
+  if( ICW.AddShape( theShape->impl<TopoDS_Shape>() ) ) {
     ICW.ComputeModel();
-    return (bool)ICW.Write( theFileName.ToCString() );
+    return ICW.Write(theFileName.c_str()) == Standard_True;
   }
   return false;
 }
-
-}
-
-//}