Fix a bug that NbShapes() and ShapeInfo() return 2 solids for a box

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

diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx
index 7614e4bda9c3833ab0ce4f6442f0c5a870d844e5..e5fd0e444ca2b6081516a057dce945b12322fe4d 100644 (file)
--- a/src/STEPExport/STEPExport.cxx
+++ b/src/STEPExport/STEPExport.cxx
@@ -1,21 +1,57 @@
-// File:       STEPExport.cxx
-// Created:    Wed May 19 14:53:52 2004
-// Author:     Pavel TELKOV
-//             <ptv@mutex.nnov.opencascade.com>
+// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  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.
+//
+// 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:        STEPExport.cxx
+// Created:     Wed May 19 14:53:52 2004
+// Author:      Pavel TELKOV
 
 #include "utilities.h"
 
+#include <Basics_Utils.hxx>
+
 #include <IFSelect_ReturnStatus.hxx>
 
 #include <STEPControl_Writer.hxx>
+#include <Interface_Static.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
 #ifdef WNT
-#include <SALOME_WNT.hxx>
+ #if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS
+  #if defined WIN32
+   #define STEPEXPORT_EXPORT __declspec( dllexport )
+  #else
+   #define STEPEXPORT_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define STEPEXPORT_EXPORT __declspec( dllimport )
+  #else
+   #define STEPEXPORT_EXPORT
+  #endif
+ #endif
 #else
-#define SALOME_WNT_EXPORT
+ #define STEPEXPORT_EXPORT
 #endif
 
 //=============================================================================
@@ -26,28 +62,38 @@
 
 extern "C"
 {
-SALOME_WNT_EXPORT
-  int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName)
+  STEPEXPORT_EXPORT int Export (const TopoDS_Shape& theShape,
+                                const TCollection_AsciiString& theFileName,
+                                const TCollection_AsciiString& /*theFormatName*/)
   {
     MESSAGE("Export STEP into file " << theFileName.ToCString());
 
-  try 
-    {
-      IFSelect_ReturnStatus status ;
-      //VRV: OCC 4.0 migration
-      STEPControl_Writer aWriter;
-//JFA: PAL6162      status = aWriter.Transfer( theShape, STEPControl_ManifoldSolidBrep );
-      status = aWriter.Transfer( theShape, STEPControl_AsIs );
-      //VRV: OCC 4.0 migration
-      if ( status == IFSelect_RetDone ) 
-         status = aWriter.Write( theFileName.ToCString() ) ;
-      if ( status == IFSelect_RetDone ) 
-       return 1;
-    }
-  catch(Standard_Failure) 
-    {
-      //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM);
-    }
-  return 0;
+    try 
+      {
+        // Set "C" numeric locale to save numbers correctly
+        Kernel_Utils::Localizer loc;
+
+        IFSelect_ReturnStatus status ;
+        //VRV: OCC 4.0 migration
+        STEPControl_Writer aWriter;
+        //VSR: 16/09/09: Convert to METERS
+        Interface_Static::SetCVal("xstep.cascade.unit","M");
+        Interface_Static::SetCVal("write.step.unit", "M");
+        Interface_Static::SetIVal("write.step.nonmanifold", 1);
+        //JFA: PAL6162      status = aWriter.Transfer( theShape, STEPControl_ManifoldSolidBrep );
+        status = aWriter.Transfer( theShape, STEPControl_AsIs );
+        //VRV: OCC 4.0 migration
+        if ( status == IFSelect_RetDone ) 
+          status = aWriter.Write( theFileName.ToCString() );
+
+        // Return previous locale
+        if ( status == IFSelect_RetDone ) 
+          return 1;
+      }
+    catch (Standard_Failure) 
+      {
+        //THROW_SALOME_CORBA_EXCEPTION("Exception catched in STEPExport", SALOME::BAD_PARAM);
+      }
+    return 0;
   }
 }