IPAL21297: errors for Netgen_1D_2D

[modules/geom.git] / src / IGESExport / IGESExport.cxx

diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index 936a5bf90ce3b615e836374f5d677eeace766f51..72e6cb2fa51e9bf8ca8f1c871ec0cbcb1f804df1 100644 (file)
--- 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/ or email : webmaster.salome@opencascade.com
+//  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,10 +61,10 @@
 
 extern "C"
 {
-SALOME_WNT_EXPORT
-  int Export(const TopoDS_Shape& theShape,
-             const TCollection_AsciiString& theFileName,
-             const TCollection_AsciiString& theFormatName)
+IGESEXPORT_EXPORT
+  int Export( const TopoDS_Shape& theShape,
+              const TCollection_AsciiString& theFileName,
+              const TCollection_AsciiString& theFormatName )
   {
     MESSAGE("Export IGES into file " << theFileName.ToCString());
     try
@@ -59,16 +75,23 @@ SALOME_WNT_EXPORT
       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 (Interface_Static::CVal("write.iges.unit"), aBrepMode);
+      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();
-      if ( ICW.Write( theFileName.ToCString() ) )
+      bool ok = ICW.Write( theFileName.ToCString() );
+      
+      // Return previous locale
+      if ( ok )
         return 1;
     }
     catch(Standard_Failure)