X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FIGESExport%2FIGESExport.cxx;h=72e6cb2fa51e9bf8ca8f1c871ec0cbcb1f804df1;hb=debaa376dae156b3d72087d03f334fcca64dfa7b;hp=5910164608efb76c5d10c9c1b223c36bbb6714bf;hpb=a62a321c849518376e3aa4d24a0b902a24167c64;p=modules%2Fgeom.git

diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index 591016460..72e6cb2fa 100644
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -1,29 +1,33 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// 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.
-// 
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/
+//  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.
+//
+//  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
 //
 // File:	IGESExport.cxx
 // Created:	Wed May 19 14:49:45 2004
 // Author:	Pavel TELKOV
 //		<ptv@mutex.nnov.opencascade.com>
-
+//
 #include "utilities.h"
 
+#include <Basics_Utils.hxx>
+
 #include <IGESControl_Controller.hxx>
 #include <IGESControl_Writer.hxx>
 #include <Interface_Static.hxx>
@@ -32,9 +36,21 @@
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
-#include <SALOME_WNT.hxx>
+ #if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS
+  #if defined WIN32
+   #define IGESEXPORT_EXPORT __declspec( dllexport )
+  #else
+   #define IGESEXPORT_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define IGESEXPORT_EXPORT __declspec( dllimport )
+  #else
+   #define IGESEXPORT_EXPORT
+  #endif
+ #endif
 #else
-#define SALOME_WNT_EXPORT
+ #define IGESEXPORT_EXPORT
 #endif
 
 //=============================================================================
@@ -45,27 +61,43 @@
 
 extern "C"
 {
-SALOME_WNT_EXPORT
-  int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName)
+IGESEXPORT_EXPORT
+  int Export( const TopoDS_Shape& theShape,
+              const TCollection_AsciiString& theFileName,
+              const TCollection_AsciiString& theFormatName )
   {
     MESSAGE("Export IGES into file " << theFileName.ToCString());
-    try 
-      {
-	//VRV: OCC 4.0 migration
-	IGESControl_Controller::Init();
-	IGESControl_Writer ICW (Interface_Static::CVal("XSTEP.iges.unit"),
-				Interface_Static::IVal("XSTEP.iges.writebrep.mode"));
-	//VRV: OCC 4.0 migration
-	
-	ICW.AddShape( theShape );
-	ICW.ComputeModel();
-	if ( ICW.Write( theFileName.ToCString() ) )
-	  return 1;
-      }
-    catch(Standard_Failure) 
-      {
-	//THROW_SALOME_CORBA_EXCEPTION("Exception catched in IGESExport", SALOME::BAD_PARAM);
-      }
+    try
+    {
+      // define, whether to write only faces (5.1 IGES format)
+      // or shells and solids also (5.3 IGES format)
+      int aBrepMode = 0;
+      if (theFormatName.IsEqual("IGES_5_3"))
+        aBrepMode = 1;
+
+      // Set "C" numeric locale to save numbers correctly
+      Kernel_Utils::Localizer loc;
+
+      // initialize writer
+      IGESControl_Controller::Init();
+      //IGESControl_Writer ICW (Interface_Static::CVal("write.iges.unit"),
+      //			Interface_Static::IVal("write.iges.brep.mode"));
+      IGESControl_Writer ICW ("M", aBrepMode); // "write.iges.unit" ->> VSR 15.09.09: export explicitly in meters
+      Interface_Static::SetCVal("xstep.cascade.unit","M");
+
+      // perform shape writing
+      ICW.AddShape( theShape );
+      ICW.ComputeModel();
+      bool ok = ICW.Write( theFileName.ToCString() );
+      
+      // Return previous locale
+      if ( ok )
+        return 1;
+    }
+    catch(Standard_Failure)
+    {
+      //THROW_SALOME_CORBA_EXCEPTION("Exception catched in IGESExport", SALOME::BAD_PARAM);
+    }
     return 0;
   }
 }