-// 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: 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>
#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
-#include <SALOME_WNT.hxx>
+ #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
+ #if defined WIN32
+ #define STEPIMPORT_EXPORT __declspec( dllexport )
+ #else
+ #define STEPIMPORT_EXPORT
+ #endif
+ #else
+ #if defined WIN32
+ #define STEPIMPORT_EXPORT __declspec( dllimport )
+ #else
+ #define STEPIMPORT_EXPORT
+ #endif
+ #endif
#else
-#define SALOME_WNT_EXPORT
+ #define STEPIMPORT_EXPORT
#endif
//=============================================================================
extern "C"
{
-SALOME_WNT_EXPORT
+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;
B.MakeCompound( compound );
try {
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+ OCC_CATCH_SIGNALS;
+#endif
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) {
// break;
// }
theError = "Wrong format of the imported file. Can't import file.";
- aResShape.Nullify();
+ aResShape.Nullify();
}
}
catch (Standard_Failure) {
theError = aFail->GetMessageString();
aResShape.Nullify();
}
+ // Return previous locale
return aResShape;
}
}
