Mantis issue 0020706: EDF 1263 GEOM: Suppress faces does notremove faces and adds...

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

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 2ee8f1363dfcf571ef82f1743aa0f3994698ec98..cb55353768b055c4a80c09104fb40332f6ad6d6a 100644 (file)
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -19,13 +19,15 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       STEPImport.cxx
-// Created:    Wed May 19 14:41:10 2004
-// Author:     Pavel TELKOV
-//             <ptv@mutex.nnov.opencascade.com>
+// File:        STEPImport.cxx
+// Created:     Wed May 19 14:41:10 2004
+// Author:      Pavel TELKOV
+//              <ptv@mutex.nnov.opencascade.com>
 //
 #include "utilities.h"
 
+#include <Basics_Utils.hxx>
+
 #include <BRep_Builder.hxx>
 
 #include <IFSelect_ReturnStatus.hxx>
@@ -35,12 +37,14 @@
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Compound.hxx>
 #include <TopoDS_Shape.hxx>
+#include <TDF_Label.hxx>
+#include <Interface_Static.hxx>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
 #ifdef WNT
- #if defined STEPIMPORT_EXPORTS
+ #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
   #if defined WIN32
    #define STEPIMPORT_EXPORT __declspec( dllexport )
   #else
@@ -68,12 +72,17 @@ extern "C"
 STEPIMPORT_EXPORT
   TopoDS_Shape Import (const TCollection_AsciiString& theFileName,
                        const TCollection_AsciiString& /*theFormatName*/,
-                       TCollection_AsciiString&       theError)
+                       TCollection_AsciiString&       theError,
+                       const TDF_Label&)
   {
     MESSAGE("Import STEP model from file " << theFileName.ToCString());
+    // Set "C" numeric locale to save numbers correctly
+    Kernel_Utils::Localizer loc;
     TopoDS_Shape aResShape;
     //VRV: OCC 4.0 migration
     STEPControl_Reader aReader;
+    //VSR: 16/09/09: Convert to METERS
+    Interface_Static::SetCVal("xstep.cascade.unit","M");
     //VRV: OCC 4.0 migration
     TopoDS_Compound compound;
     BRep_Builder B;
@@ -85,41 +94,41 @@ STEPIMPORT_EXPORT
       IFSelect_ReturnStatus status = aReader.ReadFile(theFileName.ToCString());
 
       if (status == IFSelect_RetDone) {
-       Standard_Boolean failsonly = Standard_False ;
-       aReader.PrintCheckLoad (failsonly, IFSelect_ItemsByEntity);
-       /* Root transfers */
-       Standard_Integer nbr = aReader.NbRootsForTransfer();
-       aReader.PrintCheckTransfer (failsonly, IFSelect_ItemsByEntity);
+        Standard_Boolean failsonly = Standard_False ;
+        aReader.PrintCheckLoad (failsonly, IFSelect_ItemsByEntity);
+        /* Root transfers */
+        Standard_Integer nbr = aReader.NbRootsForTransfer();
+        aReader.PrintCheckTransfer (failsonly, IFSelect_ItemsByEntity);
 
-       for ( Standard_Integer n=1; n <= nbr; n++) {
-         Standard_Boolean ok = aReader.TransferRoot(n);
-         /* Collecting resulting entities */
-         Standard_Integer nbs = aReader.NbShapes();
-         if (!ok || nbs == 0)
-         {
-           // THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM);
-           continue; // skip empty root
-         }
-         /* For a single entity */
-         else if (nbr == 1 && nbs == 1) {
-           aResShape = aReader.Shape(1);
-           break;
-         }
+        for ( Standard_Integer n=1; n <= nbr; n++) {
+          Standard_Boolean ok = aReader.TransferRoot(n);
+          /* Collecting resulting entities */
+          Standard_Integer nbs = aReader.NbShapes();
+          if (!ok || nbs == 0)
+          {
+            // THROW_SALOME_CORBA_EXCEPTION("Exception catched in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM);
+            continue; // skip empty root
+          }
+          /* For a single entity */
+          else if (nbr == 1 && nbs == 1) {
+            aResShape = aReader.Shape(1);
+            break;
+          }
 
-         for ( Standard_Integer i=1; i<=nbs; i++ ) {
-           TopoDS_Shape aShape = aReader.Shape(i);
-           if ( aShape.IsNull() ) {
-             // THROW_SALOME_CORBA_EXCEPTION("Null shape in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM) ;
-             //return aResShape;
-             continue;
-           }
-           else {
-             B.Add( compound, aShape ) ;
-           }
-         }
-       }
-       if ( aResShape.IsNull() )
-         aResShape = compound;
+          for ( Standard_Integer i=1; i<=nbs; i++ ) {
+            TopoDS_Shape aShape = aReader.Shape(i);
+            if ( aShape.IsNull() ) {
+              // THROW_SALOME_CORBA_EXCEPTION("Null shape in GEOM_Gen_i::ImportStep", SALOME::BAD_PARAM) ;
+              //return aResShape;
+              continue;
+            }
+            else {
+              B.Add( compound, aShape ) ;
+            }
+          }
+        }
+        if ( aResShape.IsNull() )
+          aResShape = compound;
 
       } else {
 //        switch (status) {
@@ -139,7 +148,7 @@ STEPIMPORT_EXPORT
 //          break;
 //        }
         theError = "Wrong format of the imported file. Can't import file.";
-       aResShape.Nullify();
+        aResShape.Nullify();
       }
     }
     catch (Standard_Failure) {
@@ -147,6 +156,7 @@ STEPIMPORT_EXPORT
       theError = aFail->GetMessageString();
       aResShape.Nullify();
     }
+    // Return previous locale
     return aResShape;
   }
 }