ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0023505: Sigsegv with fuse on cylinder and cone

Browse Source 
- Switch to C++ exception handling mechanism
This commit is contained in:
vsr 2017-11-16 15:10:41 +03:00
parent 7714104ece
commit 8af6f2a74e
22 changed files with 499 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/AdvancedEngine/AdvancedEngine_IOperations.cxx
View File

@ -1552,9 +1552,8 @@ bool AdvancedEngine_IOperations::MakePipeTShapePartition(Handle(GEOM_Object) the
TopoDS_Shape aShape = Te3->GetValue(); TopoDS_Shape aShape = Te3->GetValue();
theShape->GetLastFunction()->SetValue(aShape); theShape->GetLastFunction()->SetValue(aShape);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return false; return false;
} }
@ -1963,9 +1962,8 @@ Handle(TColStd_HSequenceOfTransient)
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1987,9 +1985,8 @@ Handle(TColStd_HSequenceOfTransient)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2125,9 +2122,8 @@ AdvancedEngine_IOperations::MakePipeTShapeWithPosition
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2158,9 +2154,8 @@ AdvancedEngine_IOperations::MakePipeTShapeWithPosition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2268,9 +2263,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2321,9 +2315,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer
try { try {
aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges); aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
if (aChamfer.IsNull()) { if (aChamfer.IsNull()) {
@ -2357,9 +2350,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2381,9 +2373,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamfer
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2503,9 +2494,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2554,9 +2544,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition
try { try {
aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges); aChamfer = myLocalOperations->MakeChamferEdges(aShape, theW, theH, theEdges);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
if (aChamfer.IsNull()) { if (aChamfer.IsNull()) {
@ -2590,9 +2579,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2620,9 +2608,8 @@ AdvancedEngine_IOperations::MakePipeTShapeChamferWithPosition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2728,9 +2715,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2780,9 +2766,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet
try { try {
aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges); aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
if (aFillet.IsNull()) { if (aFillet.IsNull()) {
@ -2842,9 +2827,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2866,9 +2850,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFillet
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2985,9 +2968,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3037,9 +3019,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition
try { try {
aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges); aFillet = myLocalOperations->MakeFilletEdges(aShape, theRF, theEdges);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
if (aFillet.IsNull()) { if (aFillet.IsNull()) {
@ -3098,9 +3079,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition
aFunction->SetValue(aResShape); aFunction->SetValue(aResShape);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3128,9 +3108,8 @@ AdvancedEngine_IOperations::MakePipeTShapeFilletWithPosition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3224,9 +3203,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeDividedDisk (double theR, do
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3299,9 +3277,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeDividedDiskPntVecR (Handle(G
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3425,9 +3402,8 @@ Handle(GEOM_Object) AdvancedEngine_IOperations::MakeSmoothingSurface (std::list<
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

10
src/BREPPlugin/BREPPlugin_IOperations.cxx
View File

@ -96,9 +96,8 @@ void BREPPlugin_IOperations::ExportBREP( const Handle(GEOM_Object) theOrigi
return; return;
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return; return;
} }
@ -152,9 +151,8 @@ BREPPlugin_IOperations::ImportBREP( const TCollection_AsciiString& theFileName )
// Greate material groups. // Greate material groups.
// MakeMaterialGroups( anImported, aSeq ); // MakeMaterialGroups( anImported, aSeq );
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return NULL; return NULL;
} }

5
src/GEOM/GEOM_Engine.cxx
View File

@ -440,9 +440,8 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) th
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail.GetMessageString());
MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail->GetMessageString());
return NULL; return NULL;
} }

5
src/GEOM/GEOM_Function.cxx
View File

@ -248,9 +248,8 @@ TopoDS_Shape GEOM_Function::GetValue()
return aShape; return aShape;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); MESSAGE("GEOM_Function::GetValue Error: " << aFail.GetMessageString());
MESSAGE("GEOM_Function::GetValue Error: " << aFail->GetMessageString());
return aShape; return aShape;
} }
} }

178
src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
View File

@ -135,9 +135,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxDXDYDZ (double theDX, dou
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -190,9 +189,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxTwoPnt (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -239,9 +237,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceHW (double theH, double
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -294,9 +291,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceObjHW (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -350,9 +346,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskPntVecR
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -408,9 +403,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskThreePnt (Handle(GEOM_Ob
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -456,9 +450,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskR (double theR, int theO
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -502,9 +495,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderRH (double theR, dou
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -549,9 +541,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderRHA (double theR, do
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -607,9 +598,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderPntVecRH (Handle(GEO
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -666,9 +656,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderPntVecRHA (Handle(GE
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -716,9 +705,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConeR1R2H (double theR1, dou
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -777,9 +765,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConePntVecR1R2H (Handle(GEOM
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -823,9 +810,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSphereR (double theR)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -876,9 +862,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSpherePntR (Handle(GEOM_Obje
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -925,9 +910,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusRR
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -983,9 +967,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusPntVecRR
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1043,9 +1026,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1105,9 +1087,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH2Ways (Handle(GEOM_
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1166,9 +1147,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1229,9 +1209,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt2Ways
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1287,9 +1266,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1348,9 +1326,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ2Ways
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1421,9 +1398,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDraftPrism
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1491,9 +1467,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_I3DPrimOperations::MakePipe
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1568,9 +1543,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle (Handle(
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1624,9 +1598,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle2Ways
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1684,12 +1657,11 @@ GEOMImpl_I3DPrimOperations::MakeFilling (std::list< Handle(GEOM_Object)> & theCo
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); if (strcmp(aFail.GetMessageString(), "Geom_BSplineSurface") == 0)
if (strcmp(aFail->GetMessageString(), "Geom_BSplineSurface") == 0)
SetErrorCode("B-Spline surface construction failed"); SetErrorCode("B-Spline surface construction failed");
else else
SetErrorCode(aFail->GetMessageString()); SetErrorCode(aFail.GetMessageString());
return NULL; return NULL;
} }
@ -1781,9 +1753,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThruSections(
return anObj; return anObj;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return anObj; return anObj;
} }
@ -1911,9 +1882,8 @@ Handle(TColStd_HSequenceOfTransient)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2097,9 +2067,8 @@ Handle(TColStd_HSequenceOfTransient)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2263,9 +2232,8 @@ Handle(TColStd_HSequenceOfTransient)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2377,9 +2345,8 @@ Handle(TColStd_HSequenceOfTransient)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2464,9 +2431,8 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThickening
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2549,8 +2515,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
SetErrorCode("RestorePath: inappropriate arguments given"); SetErrorCode("RestorePath: inappropriate arguments given");
return NULL; return NULL;
} }
@ -2639,8 +2604,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::RestorePath
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught();
SetErrorCode("RestorePath: inappropriate arguments given"); SetErrorCode("RestorePath: inappropriate arguments given");
return NULL; return NULL;
} }

95
src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
View File

@ -109,9 +109,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointXYZ
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -162,9 +161,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointWithReference
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -265,9 +263,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::makePointOnGeom
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -426,9 +423,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnLinesIntersection
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -477,9 +473,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentOnCurve
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -526,9 +521,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorDXDYDZ
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -579,9 +573,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorTwoPnt
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -633,9 +626,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLine
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -686,9 +678,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoPnt
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -739,9 +730,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -796,9 +786,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneThreePnt
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -851,9 +840,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlanePntVec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -903,9 +891,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneFace
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -958,9 +945,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlane2Vec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1010,9 +996,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneLCS
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1062,9 +1047,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarker
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1114,9 +1098,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerFromShape
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1169,9 +1152,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerPntTwoVec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1226,9 +1208,8 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentPlaneOnFace(const Hand
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

120
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -313,9 +313,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -369,9 +368,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad2Edges
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -432,9 +430,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad4Vertices
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -502,9 +499,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -559,9 +555,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa2Faces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -613,9 +608,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeBlockCompound
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -863,9 +857,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdge
anArray->SetValue(1, anIndices.FindIndex(anEdge)); anArray->SetValue(1, anIndices.FindIndex(anEdge));
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} catch (Standard_Failure) { } catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -924,9 +917,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdgeNearPoint
anArray->SetValue(1, anIndices.FindIndex(aShape)); anArray->SetValue(1, anIndices.FindIndex(aShape));
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1065,9 +1057,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByPoints
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1188,9 +1179,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByEdges
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1256,9 +1246,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetOppositeFace
anArray->SetValue(1, anIndices.FindIndex(aShape)); anArray->SetValue(1, anIndices.FindIndex(aShape));
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1446,9 +1435,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceNearPoint
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1574,9 +1562,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByNormale
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1699,9 +1686,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint
aResult = GetEngine()->AddSubShape(theShape, anArray); aResult = GetEngine()->AddSubShape(theShape, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1767,9 +1753,8 @@ Standard_Boolean GEOMImpl_IBlocksOperations::IsCompoundOfBlocks
} }
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return isCompOfBlocks; return isCompOfBlocks;
} }
@ -2449,9 +2434,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::RemoveExtraEdges
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2500,9 +2484,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::UnionFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2554,9 +2537,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::CheckAndImprove
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2626,9 +2608,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::ExplodeCompound
} }
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aBlocks; return aBlocks;
} }
@ -2811,9 +2792,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockNearPoint
aResult = GetEngine()->AddSubShape(theCompound, anArray); aResult = GetEngine()->AddSubShape(theCompound, anArray);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2926,9 +2906,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockByParts
anArray->SetValue(1, anIndices.FindIndex(aShape)); anArray->SetValue(1, anIndices.FindIndex(aShape));
aResult = GetEngine()->AddSubShape(theCompound, anArray); aResult = GetEngine()->AddSubShape(theCompound, anArray);
} }
} catch (Standard_Failure) { } catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3052,9 +3031,8 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::GetBlocksByPart
} }
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3112,9 +3090,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation1D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3174,9 +3151,8 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation2D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

35
src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
View File

@ -118,9 +118,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeBoolean
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -191,9 +190,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeFuse
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -254,9 +252,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeFuseList
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -314,9 +311,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeCommonList
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -385,9 +381,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeCutList
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -510,9 +505,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakePartition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -591,9 +585,8 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeHalfPartition
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

95
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -242,9 +242,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleThreePnt (Handle(GEOM_
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -300,9 +299,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleCenter2Pnt (Handle(GEO
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -363,9 +361,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCirclePntVecR
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -436,9 +433,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeEllipse
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -501,9 +497,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArc (Handle(GEOM_Object) the
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -560,9 +555,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcCenter (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
//Make a Python command //Make a Python command
@ -617,9 +611,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcOfEllipse (Handle(GEOM_Ob
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -679,9 +672,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline (std::list<Handle(G
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -748,9 +740,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineBezier
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -818,9 +809,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolation
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -895,9 +885,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolWithTangents
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1144,9 +1133,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1211,9 +1199,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCom
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1273,9 +1260,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1322,9 +1308,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcherCommand (const cha
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1380,9 +1365,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcher (std::list<double
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1453,9 +1437,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeIsoline
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1517,9 +1500,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1594,9 +1576,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline2DOnPlane
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

65
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -144,10 +144,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ShapeProcess (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -357,10 +356,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::SuppressFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -426,10 +424,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::CloseContour
return NULL; return NULL;
} }
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -494,10 +491,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::RemoveIntWires
return NULL; return NULL;
} }
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -561,10 +557,9 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FillHoles (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -636,9 +631,8 @@ GEOMImpl_IHealingOperations::Sew (std::list<Handle(GEOM_Object)>& theObjects,
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -703,9 +697,8 @@ GEOMImpl_IHealingOperations::RemoveInternalFaces (std::list< Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -762,9 +755,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::DivideEdge (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -829,9 +821,8 @@ GEOMImpl_IHealingOperations::DivideEdgeByPoint (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -895,9 +886,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FuseCollinearEdgesWithinWire
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1082,9 +1072,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientation (Handle(GEOM_
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1153,9 +1142,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientationCopy (Handle(G
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1213,9 +1201,8 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::LimitTolerance (Handle(GEOM_Obj
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

10
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -128,9 +128,8 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::MakeCopy (Handle(GEOM_Object) th
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -396,9 +395,8 @@ bool GEOMImpl_IInsertOperations::TransferData
return false; return false;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return false; return false;
} }

75
src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
View File

@ -119,9 +119,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -178,9 +177,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -246,9 +244,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -314,9 +311,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -382,9 +378,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -449,9 +444,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -518,9 +512,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet1D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -577,9 +570,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferAll (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -632,9 +624,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdge
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -688,9 +679,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -749,9 +739,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -818,9 +807,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -888,9 +876,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -958,9 +945,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1020,9 +1006,8 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeArchimede (Handle(GEOM_Object
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

95
src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
View File

@ -785,9 +785,8 @@ void GEOMImpl_IMeasureOperations::GetPosition
aDirZ.Coord(Zx, Zy, Zz); aDirZ.Coord(Zx, Zy, Zz);
aDirX.Coord(Xx, Xy, Xz); aDirX.Coord(Xx, Xy, Xz);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return; return;
} }
@ -832,9 +831,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetCentreOfMass
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -884,9 +882,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetVertexByIndex
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -941,9 +938,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetNormal
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1003,9 +999,8 @@ void GEOMImpl_IMeasureOperations::GetBasicProperties (Handle(GEOM_Object) theSha
} }
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return; return;
} }
@ -1069,9 +1064,8 @@ void GEOMImpl_IMeasureOperations::GetInertia
GProp_PrincipalProps Pr = System.PrincipalProperties(); GProp_PrincipalProps Pr = System.PrincipalProperties();
Pr.Moments(Ix,Iy,Iz); Pr.Moments(Ix,Iy,Iz);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return; return;
} }
@ -1130,9 +1124,8 @@ void GEOMImpl_IMeasureOperations::GetBoundingBox
B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); B.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return; return;
} }
@ -1179,9 +1172,8 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetBoundingBox
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1256,9 +1248,8 @@ void GEOMImpl_IMeasureOperations::GetTolerance
VertMin = T; VertMin = T;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return; return;
} }
@ -1299,9 +1290,8 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object) theShape,
FillErrors(ana, aShape, theErrors); FillErrors(ana, aShape, theErrors);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return false; return false;
} }
@ -1924,9 +1914,8 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object)
Astr = Astr + " SOLID : " + TCollection_AsciiString(nbFlatType[TopAbs_SOLID]) + "\n"; Astr = Astr + " SOLID : " + TCollection_AsciiString(nbFlatType[TopAbs_SOLID]) + "\n";
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return Astr; return Astr;
} }
@ -2097,9 +2086,8 @@ GEOMImpl_IMeasureOperations::GetMinDistance (Handle(GEOM_Object) theShape1,
return MinDist; return MinDist;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return MinDist; return MinDist;
} }
@ -2173,9 +2161,8 @@ Standard_Integer GEOMImpl_IMeasureOperations::ClosestPoints (Handle(GEOM_Object)
} }
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return nbSolutions; return nbSolutions;
} }
@ -2216,10 +2203,9 @@ void GEOMImpl_IMeasureOperations::PointCoordinates (Handle(GEOM_Object) theShape
SetErrorCode(OK); SetErrorCode(OK);
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
} }
} }
@ -2289,10 +2275,9 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine
SetErrorCode(OK); SetErrorCode(OK);
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
} }
return anAngle; return anAngle;
@ -2354,10 +2339,9 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngleBtwVectors (Handle(GEOM_Objec
SetErrorCode(OK); SetErrorCode(OK);
} }
catch (Standard_Failure) catch (Standard_Failure& aFail)
{ {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
} }
return anAngle; return anAngle;
@ -2400,9 +2384,8 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByParam
aRes = fabs(Prop.Curvature()); aRes = fabs(Prop.Curvature());
SetErrorCode(OK); SetErrorCode(OK);
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aRes; return aRes;
} }
@ -2455,9 +2438,8 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
SetErrorCode(OK); SetErrorCode(OK);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aRes; return aRes;
} }
@ -2507,9 +2489,8 @@ Standard_Real GEOMImpl_IMeasureOperations::getSurfaceCurvatures
SetErrorCode(OK); SetErrorCode(OK);
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aRes; return aRes;
} }

105
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
View File

@ -231,9 +231,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdge
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -290,9 +289,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeOnCurveByLength
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -346,9 +344,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeWire
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -420,9 +417,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeWire
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -485,9 +481,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFace (Handle(GEOM_Object) th
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -554,9 +549,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -640,9 +634,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceFromSurface
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -728,9 +721,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWithConstraints
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -841,9 +833,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -912,9 +903,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSolidFromConnectedFaces
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -980,9 +970,8 @@ GEOMImpl_IShapesOperations::MakeGlueFaces (std::list< Handle(GEOM_Object) >& the
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -1130,9 +1119,8 @@ GEOMImpl_IShapesOperations::MakeGlueFacesByList(std::list< Handle(GEOM_Object) >
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -1196,9 +1184,8 @@ GEOMImpl_IShapesOperations::MakeGlueEdges (std::list< Handle(GEOM_Object) >& the
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -1378,9 +1365,8 @@ GEOMImpl_IShapesOperations::MakeGlueEdgesByList (std::list< Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
// to provide warning // to provide warning
if (!aFunction->GetValue().IsNull()) { if (!aFunction->GetValue().IsNull()) {
isWarning = Standard_True; isWarning = Standard_True;
@ -2143,9 +2129,8 @@ Standard_Integer GEOMImpl_IShapesOperations::NumberOfSubShapes
nbShapes = nbTypes[theShapeType]; nbShapes = nbTypes[theShapeType];
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return -1; return -1;
} }
@ -2191,9 +2176,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ReverseShape(Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3233,9 +3217,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeExtraction
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -3323,9 +3306,8 @@ Handle(TColStd_HSequenceOfInteger)
VertMax = T; VertMax = T;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aSeqOfIDs; return aSeqOfIDs;
} }
// END: Mantis issue 0020961 // END: Mantis issue 0020961
@ -5213,9 +5195,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ExtendEdge
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -5282,9 +5263,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ExtendFace
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -5344,9 +5324,8 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeSurfaceFromFace
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }

175
src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
View File

@ -133,9 +133,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPoints
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -184,9 +183,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZ
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -238,9 +236,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPointsCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -291,9 +288,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -344,9 +340,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVector
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -395,9 +390,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -454,9 +448,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorDistance
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -515,9 +508,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate1D
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -578,9 +570,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate2D (Handle(GEOM_Obje
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -774,9 +765,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlane
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -825,9 +815,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlaneCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -877,9 +866,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPoint
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -928,9 +916,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPointCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -980,9 +967,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxis
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1031,9 +1017,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxisCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1081,9 +1066,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1133,9 +1117,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1203,9 +1186,8 @@ GEOMImpl_ITransformOperations::ProjectShapeCopy (Handle(GEOM_Object) theSource,
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
} }
@ -1269,9 +1251,8 @@ Standard_Real GEOMImpl_ITransformOperations::ProjectPointOnWire
return aResult; return aResult;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aResult; return aResult;
} }
@ -1331,9 +1312,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShape
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1390,9 +1370,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1459,9 +1438,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeAlongAxes (Handle(G
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1522,9 +1500,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShape
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1579,9 +1556,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShapeCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1639,9 +1615,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionAlongPath
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1700,9 +1675,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate (Handle(GEOM_Object) t
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1753,9 +1727,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateCopy (Handle(GEOM_Objec
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1807,9 +1780,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate1D (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1866,9 +1838,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate1D (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1928,9 +1899,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -1992,9 +1962,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object)
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2053,9 +2022,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePoints (Handle(GEO
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2108,9 +2076,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2252,9 +2219,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TransformLikeOtherCopy
return NULL; return NULL;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return NULL; return NULL;
} }
@ -2320,9 +2286,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MakeProjectionOnCylinder
return aResult; return aResult;
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode(aFail.GetMessageString());
SetErrorCode(aFail->GetMessageString());
return aResult; return aResult;
} }

5
src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx
View File

@ -220,9 +220,8 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(Handle(TFunction_Logbook)& l
try { try {
OrtProj.Build(); OrtProj.Build();
} catch (Standard_Failure) { } catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); TCollection_AsciiString aMsg (aFail.GetMessageString());
TCollection_AsciiString aMsg (aFail->GetMessageString());
if (!aMsg.Length()) if (!aMsg.Length())
aMsg = "Projection aborted : possibly the source shape intersects the cylinder's axis"; aMsg = "Projection aborted : possibly the source shape intersects the cylinder's axis";
Standard_ConstructionError::Raise(aMsg.ToCString()); Standard_ConstructionError::Raise(aMsg.ToCString());

10
src/IGESPlugin/IGESPlugin_IOperations.cxx
View File

@ -100,9 +100,8 @@ void IGESPlugin_IOperations::ExportIGES( const Handle(GEOM_Object) theOrigi
return; return;
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return; return;
} }
@ -158,9 +157,8 @@ IGESPlugin_IOperations::ImportIGES( const TCollection_AsciiString& theFileName,
// Greate material groups. // Greate material groups.
// MakeMaterialGroups( anImported, aSeq ); // MakeMaterialGroups( anImported, aSeq );
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return NULL; return NULL;
} }

10
src/IGESPlugin/IGESPlugin_ImportDriver.cxx
View File

@ -182,9 +182,8 @@ Standard_Integer IGESPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log
aResShape.Nullify(); aResShape.Nullify();
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); anError = aFail.GetMessageString();
anError = aFail->GetMessageString();
aResShape.Nullify(); aResShape.Nullify();
} }
@ -268,9 +267,8 @@ IGESPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName,
theError = theFileName + " reading failed"; theError = theFileName + " reading failed";
} }
} }
catch (Standard_Failure) { catch (Standard_Failure& aFail) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); theError = aFail.GetMessageString();
theError = aFail->GetMessageString();
} }
if (!aValue.IsNull()) if (!aValue.IsNull())
return aValue->String(); return aValue->String();

10
src/STEPPlugin/STEPPlugin_IOperations.cxx
View File

@ -145,9 +145,8 @@ void STEPPlugin_IOperations::ExportSTEP
return; return;
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return; return;
} }
@ -205,9 +204,8 @@ STEPPlugin_IOperations::ImportSTEP(const TCollection_AsciiString& theFileName,
// Greate material groups. // Greate material groups.
MakeMaterialGroups( anImported, aSeq ); MakeMaterialGroups( anImported, aSeq );
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return NULL; return NULL;
} }

10
src/STEPPlugin/STEPPlugin_ImportDriver.cxx
View File

@ -787,9 +787,8 @@ Standard_Integer STEPPlugin_ImportDriver::Execute(Handle(TFunction_Logbook)& log
aResShape.Nullify(); aResShape.Nullify();
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); anError = aFail.GetMessageString();
anError = aFail->GetMessageString();
aResShape.Nullify(); aResShape.Nullify();
} }
@ -872,9 +871,8 @@ STEPPlugin_ImportDriver::GetValue( const TCollection_AsciiString& theFileName,
theError = theFileName + " reading failed"; theError = theFileName + " reading failed";
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); theError = aFail.GetMessageString();
theError = aFail->GetMessageString();
} }
return aValue; return aValue;
} }

10
src/STLPlugin/STLPlugin_IOperations.cxx
View File

@ -105,9 +105,8 @@ void STLPlugin_IOperations::ExportSTL( const Handle(GEOM_Object) theOrigina
return; return;
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return; return;
} }
@ -162,9 +161,8 @@ STLPlugin_IOperations::ImportSTL( const TCollection_AsciiString& theFileName )
// Greate material groups. // Greate material groups.
// MakeMaterialGroups( anImported, aSeq ); // MakeMaterialGroups( anImported, aSeq );
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return NULL; return NULL;
} }

5
src/VTKPlugin/VTKPlugin_IOperations.cxx
View File

@ -95,9 +95,8 @@ void VTKPlugin_IOperations::ExportVTK( const Handle(GEOM_Object) theOrigina
return; return;
} }
} }
catch( Standard_Failure ) { catch( Standard_Failure& aFail ) {
Handle(Standard_Failure) aFail = Standard_Failure::Caught(); SetErrorCode( aFail.GetMessageString() );
SetErrorCode( aFail->GetMessageString() );
return; return;
} }