From 057dae0b9ee21613544f7949ac5f2d0651aef67f Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 23 Aug 2006 08:45:42 +0000 Subject: [PATCH] SMH: Version ported on new OCT6.1.1 --- src/SMESH/SMESH_subMesh.cxx | 3 ++- src/SMESH_I/SMESH_MeshEditor_i.cxx | 11 +++++--- src/StdMeshers/StdMeshers_Distribution.cxx | 27 ++++++++++--------- .../StdMeshers_NumberOfSegments.cxx | 17 ++++++------ src/StdMeshers/StdMeshers_Regular_1D.cxx | 18 ++++++++----- .../StdMeshersGUI_DistrPreview.cxx | 27 ++++++++++--------- 6 files changed, 59 insertions(+), 44 deletions(-) diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx index c968ac91a..c41b91806 100644 --- a/src/SMESH/SMESH_subMesh.cxx +++ b/src/SMESH/SMESH_subMesh.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -1265,6 +1265,7 @@ bool SMESH_subMesh::ComputeStateEngine(int event) RemoveSubMeshElementsAndNodes(); { try { + OCC_CATCH_SIGNALS; if (!algo->NeedDescretBoundary() && !algo->OnlyUnaryInput()) ret = ApplyToCollection( algo, GetCollection( gen, algo ) ); else diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 5227a9668..5f5f67fb2 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -37,7 +37,6 @@ #include "SMESH_Gen_i.hxx" #include "SMESH_Filter_i.hxx" #include "SMESH_PythonDump.hxx" -#include "CASCatch.hxx" #include "utilities.h" @@ -45,6 +44,9 @@ #include #include +#include +#include + #include typedef map elements; @@ -1073,7 +1076,7 @@ void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElemen << theIDsOfElements << ", stepVector, " << theNbOfSteps << " )"; } - CASCatch_CATCH(Standard_Failure) { + catch(Standard_Failure) { 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 4fd04bea9..2e79dbb1a 100644 --- a/src/StdMeshers/StdMeshers_Distribution.cxx +++ b/src/StdMeshers/StdMeshers_Distribution.cxx @@ -27,11 +27,13 @@ // $Header$ #include "StdMeshers_Distribution.hxx" -#include "CASCatch.hxx" #include #include +#include +#include + Function::Function( const int conv ) : myConv( conv ) { @@ -46,11 +48,11 @@ bool Function::value( const double, double& f ) const bool ok = true; if( myConv==0 ) { - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; f = pow( 10, f ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); f = 0.0; @@ -170,12 +172,12 @@ FunctionExpr::FunctionExpr( const char* str, const int conv ) myValues( 1, 1 ) { bool ok = true; - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString )str ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); ok = false; @@ -206,10 +208,11 @@ bool FunctionExpr::value( const double t, double& f ) const ( ( TColStd_Array1OfReal& )myValues ).ChangeValue( 1 ) = t; bool ok = true; - CASCatch_TRY { + try { + OCC_CATCH_SIGNALS; f = myExpr->Expression()->Evaluate( myVars, myValues ); } - CASCatch_CATCH(Standard_Failure) { + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); f = 0.0; ok = false; @@ -222,13 +225,13 @@ bool FunctionExpr::value( const double t, double& f ) const double FunctionExpr::integral( const double a, const double b ) const { double res = 0.0; - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; math_GaussSingleIntegration _int( ( math_Function& )*this, a, b, 20 ); if( _int.IsDone() ) res = _int.Value(); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { res = 0.0; MESSAGE( "Exception in integral calculating" ); diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx index 76cd67965..2cb4957ab 100644 --- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx +++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx @@ -33,8 +33,6 @@ #include "SMESHDS_SubMesh.hxx" #include "SMESH_Mesh.hxx" -#include "CASCatch.hxx" - #include #include #include @@ -43,6 +41,9 @@ #include #include +#include +#include + using namespace std; const double PRECISION = 1e-7; @@ -218,11 +219,11 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const std::vector& ta double val = table[i*2+1]; if( _convMode==0 ) { - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; val = pow( 10.0, val ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); throw SALOME_Exception( LOCALIZED( "invalid value")); @@ -312,12 +313,12 @@ bool process( const TCollection_AsciiString& str, int convMode, { bool parsed_ok = true; Handle( ExprIntrp_GenExp ) myExpr; - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( str.ToCString() ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); parsed_ok = false; diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx index f13f1cbce..4033af584 100644 --- a/src/StdMeshers/StdMeshers_Regular_1D.cxx +++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -31,10 +31,6 @@ using namespace std; #include "StdMeshers_Regular_1D.hxx" #include "StdMeshers_Distribution.hxx" -#include "SMESH_Gen.hxx" -#include "SMESH_Mesh.hxx" -#include "SMESH_HypoFilter.hxx" -#include "SMESH_subMesh.hxx" #include "StdMeshers_LocalLength.hxx" #include "StdMeshers_NumberOfSegments.hxx" @@ -43,6 +39,11 @@ using namespace std; #include "StdMeshers_Deflection1D.hxx" #include "StdMeshers_AutomaticLength.hxx" +#include "SMESH_Gen.hxx" +#include "SMESH_Mesh.hxx" +#include "SMESH_HypoFilter.hxx" +#include "SMESH_subMesh.hxx" + #include "SMDS_MeshElement.hxx" #include "SMDS_MeshNode.hxx" #include "SMDS_EdgePosition.hxx" @@ -58,15 +59,17 @@ using namespace std; #include #include #include -#include #include #include #include #include -#include #include +#include #include +#include +#include + #include #include @@ -572,6 +575,7 @@ bool StdMeshers_Regular_1D::Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aSh if ( !_mainEdge.IsNull() ) reversed = aMesh.IsReversedInChain( EE, _mainEdge ); try { + OCC_CATCH_SIGNALS; if ( ! computeInternalParameters( E, params, reversed )) { //cout << "computeInternalParameters() failed" < #include +#include +#include + StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h ) : QwtPlot( p ), myPoints( 50 ), @@ -240,11 +242,11 @@ void StdMeshersGUI_DistrPreview::update() delete[] y; x = y = 0; - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; replot(); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); } @@ -285,12 +287,12 @@ bool isCorrectArg( const Handle( Expr_GeneralExpression )& expr ) bool StdMeshersGUI_DistrPreview::init( const QString& str ) { bool parsed_ok = true; - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; myExpr = ExprIntrp_GenExp::Create(); myExpr->Process( ( Standard_CString ) str.latin1() ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); parsed_ok = false; @@ -327,10 +329,11 @@ double StdMeshersGUI_DistrPreview::calc( bool& ok ) double res = 0.0; ok = true; - CASCatch_TRY { + try { + OCC_CATCH_SIGNALS; res = myExpr->Expression()->Evaluate( myVars, myValues ); } - CASCatch_CATCH(Standard_Failure) { + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); ok = false; res = 0.0; @@ -351,15 +354,15 @@ bool StdMeshersGUI_DistrPreview::convert( double& v ) const { case EXPONENT: { - CASCatch_TRY - { + try { + OCC_CATCH_SIGNALS; // in StdMeshers_NumberOfSegments.cc // const double PRECISION = 1e-7; // if(v < -7) v = -7.0; v = pow( 10.0, v ); } - CASCatch_CATCH(Standard_Failure) + catch(Standard_Failure) { Handle(Standard_Failure) aFail = Standard_Failure::Caught(); v = 0.0;