From b64c8b0f51d7543edd9b85d0cce38e292dbec170 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 29 Aug 2006 08:03:27 +0000 Subject: [PATCH] Usage of CASCatch with old OCCT versions. --- src/SMESH_I/SMESH_MeshEditor_i.cxx | 26 ++++++-- src/StdMeshers/StdMeshers_Distribution.cxx | 59 +++++++++++++------ .../StdMeshers_NumberOfSegments.cxx | 33 ++++++++--- .../StdMeshersGUI_DistrPreview.cxx | 56 +++++++++++++----- 4 files changed, 128 insertions(+), 46 deletions(-) diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 4e588ec8c..55fc2330d 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -44,8 +44,17 @@ #include #include +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 +#define NO_CAS_CATCH +#endif + #include + +#ifdef NO_CAS_CATCH #include +#else +#include "CASCatch.hxx" +#endif #include @@ -1054,18 +1063,20 @@ void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElemen myLastCreatedElems = new SMESH::long_array(); myLastCreatedNodes = new SMESH::long_array(); +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif SMESHDS_Mesh* aMesh = GetMeshDS(); - + map elements; ToMap(theIDsOfElements, aMesh, elements); const SMESH::PointStruct * P = &theStepVector.PS; gp_Vec stepVec( P->x, P->y, P->z ); - + TElemOfElemListMap aHystory; ::SMESH_MeshEditor anEditor( _myMesh ); anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory); @@ -1075,10 +1086,13 @@ void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElemen // Update Python script TPythonDump() << "stepVector = " << theStepVector; TPythonDump() << this << ".ExtrusionSweep( " - << theIDsOfElements << ", stepVector, " << theNbOfSteps << " )"; + << theIDsOfElements << ", stepVector, " << theNbOfSteps << " )"; - } - catch(Standard_Failure) { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); INFOS( "SMESH_MeshEditor_i::ExtrusionSweep fails - "<< aFail->GetMessageString() ); } diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx index 3855ce148..fe6f38f67 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -31,8 +31,17 @@ #include #include +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 +#define NO_CAS_CATCH +#endif + #include + +#ifdef NO_CAS_CATCH #include +#else +#include "CASCatch.hxx" +#endif Function::Function( const int conv ) : myConv( conv ) @@ -46,16 +55,19 @@ Function::~Function() bool Function::value( const double, double& f ) const { bool ok = true; - if( myConv==0 ) - { + if (myConv == 0) { +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif f = pow( 10, f ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); f = 0.0; ok = false; @@ -174,15 +186,19 @@ FunctionExpr::FunctionExpr( const char* str, const int conv ) myValues( 1, 1 ) { bool ok = true; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString )str ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); ok = false; } @@ -212,13 +228,18 @@ bool FunctionExpr::value( const double t, double& f ) const ( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t; bool ok = true; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif f = myExpr->Expression()->Evaluate( myVars, myValues ); - } - catch(Standard_Failure) { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); f = 0.0; ok = false; @@ -231,16 +252,20 @@ bool FunctionExpr::value( const double t, double& f ) const double FunctionExpr::integral( const double a, const double b ) const { double res = 0.0; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif math_GaussSingleIntegration _int( ( math_Function& )*this, a, b, 20 ); if( _int.IsDone() ) res = _int.Value(); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif res = 0.0; MESSAGE( "Exception in integral calculating" ); } diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index 64ea2a674..f4819f92c 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -41,8 +41,17 @@ #include #include +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 +#define NO_CAS_CATCH +#endif + #include + +#ifdef NO_CAS_CATCH #include +#else +#include "CASCatch.hxx" +#endif using namespace std; @@ -219,14 +228,18 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector& ta double val = table[i*2+1]; if( _convMode==0 ) { +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif val = pow( 10.0, val ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); throw SALOME_Exception( LOCALIZED( "invalid value")); return; @@ -315,15 +328,19 @@ bool process( const TCollection_AsciiString& str, int convMode, { bool parsed_ok = true; Handle( ExprIntrp_GenExp ) myExpr; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( str.ToCString() ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); parsed_ok = false; } diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx index be12490cc..482aeb6be 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx @@ -23,8 +23,17 @@ #include #include +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 +#define NO_CAS_CATCH +#endif + #include + +#ifdef NO_CAS_CATCH #include +#else +#include "CASCatch.hxx" +#endif StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h ) : QwtPlot( p ), @@ -242,14 +251,18 @@ void StdMeshersGUI_DistrPreview::update() delete[] y; x = y = 0; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif replot(); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); } } @@ -289,15 +302,19 @@ bool isCorrectArg( const Handle( Expr_GeneralExpression )& expr ) bool StdMeshersGUI_DistrPreview::init( const QString& str ) { bool parsed_ok = true; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString ) str.latin1() ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); parsed_ok = false; } @@ -333,13 +350,18 @@ double StdMeshersGUI_DistrPreview::calc( bool& ok ) double res = 0.0; ok = true; +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif res = myExpr->Expression()->Evaluate( myVars, myValues ); - } - catch(Standard_Failure) { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); ok = false; res = 0.0; @@ -360,18 +382,22 @@ bool StdMeshersGUI_DistrPreview::convert( double& v ) const { case EXPONENT: { +#ifdef NO_CAS_CATCH try { -#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { #endif // in StdMeshers_NumberOfSegments.cc // const double PRECISION = 1e-7; // if(v < -7) v = -7.0; v = pow( 10.0, v ); - } - catch(Standard_Failure) - { +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif Handle(Standard_Failure) aFail = Standard_Failure::Caught(); v = 0.0; ok = false; -- 2.30.2